Hi, Rucha! First, please check the buildbot and make sure all tests pass. You've changed MySQL->MariaDB in result files, but without corresponding changes in the code your result files now differ from the actual test output. One more comment below On Mar 21, Rucha Deodhar wrote:

revision-id: 2858f9fb7e0 (mariadb-10.5.2-274-g2858f9fb7e0) parent(s): 41485551c58 author: Rucha Deodhar committer: Rucha Deodhar timestamp: 2021-03-18 13:58:34 +0530 message:

MDEV-22189: Change error messages inside code to have mariadb instead of mysql

Fix: Changed error messages, rerecorded results and changed other relevant files.

diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index 19229a57a82..a045a479be9 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -987,12 +987,12 @@ sub parse_tx_text { # Parsing the line that begins 'MySQL thread id' is complicated. The only # thing always in the line is the thread and query id. See function # innobase_mysql_print_thd in InnoDB source file sql/ha_innodb.cc. - my ( $thread_line ) = $txn =~ m/^(MySQL thread id .*)$/m; + my ( $thread_line ) = $txn =~ m/^(MariaDB thread id .*)$/m; my ( $mysql_thread_id, $query_id, $hostname, $ip, $user, $query_status );

if ( $thread_line ) { # These parts can always be gotten. - ( $mysql_thread_id, $query_id ) = $thread_line =~ m/^MySQL thread id $d, .*?query id $d/m; + ( $mysql_thread_id, $query_id ) = $thread_line =~ m/^MariaDB thread id $d, .*?query id $d/m;

# If it's a master/slave thread, "Has (read|sent) all" may be the thread's # proc_info. In these cases, there won't be any host/ip/user info @@ -4144,15 +4144,15 @@ my $innodb_parser = InnoDBParser->new;

my $nonfatal_errs = join('|', 'Access denied for user', - 'Unknown MySQL server host', + 'Unknown MariaDB server host', 'Unknown database', - 'Can\'t connect to local MySQL server through socket', - 'Can\'t connect to MySQL server on', + 'Can\'t connect to local MariaDB server through socket', + 'Can\'t connect to MariaDB server on', 'MySQL server has gone away', 'Cannot call SHOW INNODB STATUS', 'Access denied', 'AutoCommit', - 'Lost connection to MySQL server', + 'Lost connection to MariaDB server', 'Too many connections', );

innotop is generally a separate tool that technically could work both with MariaDB and MySQL. So, better use (?:MariaDB|MySQL) in all regexp patterns above. Regards, Sergei VP of MariaDB Server Engineering and security@mariadb.org