Back-port of changes made to 6.0-maria (to remove compiler warnings or fix simple test failures)

in the last days: substitution in tests has to work for absolute datadir (/dev/shm/...);
internal temp tables (like information_schema) can be Maria; Maria may not be compiled in; splitting
too long maria.test in two; mtr --embedded runs in mysql-test not mysql-test/var/master-data
so we need some absolute paths in tests; can't restart mysqld in --embedded; missing DBUG_VOID_RETURN in
mysqltest.c (fix from Serg); is_collation_character_set_applicability.test was too long name
which broke tar's 99-char limit.

client/mysqltest.c

@@ -2300,7 +2300,7 @@ void do_source(struct st_command *command)
   }
 
   dynstr_free(&ds_filename);
-  return;
+  DBUG_VOID_RETURN;
 }
 
 

mysql-test/mysql-test-run.pl

@@ -2186,13 +2186,13 @@ sub environment_setup () {
   # ----------------------------------------------------
   # Setup env so childs can execute maria_pack and maria_chk
   # ----------------------------------------------------
-  $ENV{'MARIA_CHK'}= mtr_native_path(mtr_exe_exists(
+  $ENV{'MARIA_CHK'}= mtr_native_path(mtr_exe_maybe_exists(
                        vs_config_dirs('storage/maria', 'maria_chk'),
                        vs_config_dirs('maria', 'maria_chk'),
                        "$path_client_bindir/maria_chk",
                        "$glob_basedir/storage/maria/maria_chk",
                        "$glob_basedir/maria/maria_chk"));
-  $ENV{'MARIA_PACK'}= mtr_native_path(mtr_exe_exists(
+  $ENV{'MARIA_PACK'}= mtr_native_path(mtr_exe_maybe_exists(
                         vs_config_dirs('storage/maria', 'maria_pack'),
                         vs_config_dirs('maria', 'maria_pack'),
                         "$path_client_bindir/maria_pack",

mysql-test/r/maria-recover.result

@@ -24,8 +24,8 @@ select * from t_corrupted2;
 a
 ThursdayMorningsMarket
 Warnings:
-Error	145	Table '.t_corrupted2' is marked as crashed and should be repaired
-Error	1194	Table 't_corrupted2' is marked as crashed and should be repaired
+Error	145	t_corrupted2' is marked as crashed and should be repaired
+Error	1194	t_corrupted2' is marked as crashed and should be repaired
 Error	1034	1 client is using or hasn't closed the table properly
 Error	1034	Wrong base information on indexpage at page: 1
 select * from t_corrupted2;

mysql-test/suite/funcs_1/datadict/processlist_priv.inc

@@ -111,6 +111,7 @@ connect (con100,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo   SHOW/SELECT shows all processes/threads.
 --echo ####################################################################################
 connection default;
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE $table;
 --replace_column 1 ID 6 TIME
 eval SHOW $table;
@@ -127,6 +128,7 @@ eval SELECT $columns FROM $table $select_where ORDER BY id;
 connection con100;
 --echo   SHOW/SELECT shows only the processes (1) of the user.
 --echo ####################################################################################
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE $table;
 --replace_column 1 ID 6 TIME
 eval SHOW $table;

mysql-test/suite/funcs_1/datadict/processlist_val.inc

@@ -53,6 +53,7 @@ CREATE TABLE test.t1 (f1 BIGINT);
 
 # Show the definition of the PROCESSLIST table
 #--------------------------------------------------------------------------
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 SHOW CREATE TABLE INFORMATION_SCHEMA.PROCESSLIST;
 
 

mysql-test/suite/funcs_1/datadict/tables2.inc

@@ -29,6 +29,7 @@
 let $innodb_pattern = 'InnoDB free';
 let $ndb_pattern    = 'number_of_replicas';
 --vertical_results
+--replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA MARIA MYISAM_OR_MARIA
 --replace_column  8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#"
 eval
 SELECT *,

mysql-test/suite/funcs_1/r/is_columns.result

@@ -69,7 +69,7 @@ COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
   `EXTRA` varchar(27) NOT NULL DEFAULT '',
   `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
   `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.COLUMNS;
 Field	Type	Null	Key	Default	Extra
 TABLE_CATALOG	varchar(512)	YES		NULL	

mysql-test/suite/funcs_1/r/is_events.result

@@ -79,7 +79,7 @@ EVENTS	CREATE TEMPORARY TABLE `EVENTS` (
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
   `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
   `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.EVENTS;
 Field	Type	Null	Key	Default	Extra
 EVENT_CATALOG	varchar(64)	YES		NULL	

mysql-test/suite/funcs_1/r/is_routines.result

@@ -77,7 +77,7 @@ ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
   `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
   `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.ROUTINES;
 Field	Type	Null	Key	Default	Extra
 SPECIFIC_NAME	varchar(64)	NO			

mysql-test/suite/funcs_1/r/is_tables_is.result

@@ -86,9 +86,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -155,9 +155,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	EVENTS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -270,9 +270,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARTITIONS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -293,9 +293,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PLUGINS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -316,9 +316,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PROCESSLIST
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -362,9 +362,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -569,9 +569,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -615,9 +615,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -724,9 +724,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -793,9 +793,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	EVENTS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -908,9 +908,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARTITIONS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -931,9 +931,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PLUGINS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -954,9 +954,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PROCESSLIST
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -1000,9 +1000,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -1207,9 +1207,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -1253,9 +1253,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#

mysql-test/suite/funcs_1/r/is_tables_myisam.result

@@ -415,7 +415,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t1
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -438,7 +438,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t10
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -461,7 +461,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t11
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -484,7 +484,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t2
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -507,7 +507,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t3
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -530,7 +530,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t4
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -553,7 +553,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t7
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -576,7 +576,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t8
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -599,7 +599,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t9
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -622,9 +622,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	tb1
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -645,9 +645,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	tb2
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -668,9 +668,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	tb3
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -691,9 +691,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	tb4
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -714,9 +714,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test1
 TABLE_NAME	tb2
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -737,7 +737,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test4
 TABLE_NAME	t6
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -776,7 +776,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t1
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -799,7 +799,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t10
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -822,7 +822,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t11
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -845,7 +845,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t2
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -868,7 +868,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t3
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -891,7 +891,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t4
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -914,7 +914,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t7
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -937,7 +937,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t8
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -960,7 +960,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	t9
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -983,9 +983,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	tb1
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -1006,9 +1006,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	tb2
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -1029,9 +1029,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	tb3
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -1052,9 +1052,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	test
 TABLE_NAME	tb4
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#

mysql-test/suite/funcs_1/r/is_tables_mysql.result

@@ -16,7 +16,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	columns_priv
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -39,7 +39,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	db
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -62,9 +62,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	event
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -85,7 +85,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -110,7 +110,7 @@ TABLE_NAME	general_log
 TABLE_TYPE	BASE TABLE
 ENGINE	CSV
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -131,7 +131,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -154,7 +154,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	help_keyword
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -177,7 +177,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	help_relation
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -200,9 +200,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	help_topic
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -223,7 +223,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	host
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -246,9 +246,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	ndb_binlog_index
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -269,7 +269,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	plugin
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -292,9 +292,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -315,7 +315,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	procs_priv
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -338,7 +338,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	servers
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -363,7 +363,7 @@ TABLE_NAME	slow_log
 TABLE_TYPE	BASE TABLE
 ENGINE	CSV
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -384,7 +384,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -407,7 +407,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	time_zone
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -430,7 +430,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	time_zone_leap_second
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -453,7 +453,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	time_zone_name
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -476,7 +476,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	time_zone_transition
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -499,7 +499,7 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	time_zone_transition_type
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
@@ -522,9 +522,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
 TABLE_NAME	user
 TABLE_TYPE	BASE TABLE
-ENGINE	MyISAM
+ENGINE	MYISAM_OR_MARIA
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#

mysql-test/suite/funcs_1/r/is_triggers.result

@@ -75,7 +75,7 @@ TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
   `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
   `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.TRIGGERS;
 Field	Type	Null	Key	Default	Extra
 TRIGGER_CATALOG	varchar(512)	YES		NULL	

mysql-test/suite/funcs_1/r/is_views.result

@@ -51,7 +51,7 @@ VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
   `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
   `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT ''
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.VIEWS;
 Field	Type	Null	Key	Default	Extra
 TABLE_CATALOG	varchar(512)	YES		NULL	

mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result

@@ -32,7 +32,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `TIME` bigint(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
@@ -102,7 +102,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `TIME` bigint(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist

mysql-test/suite/funcs_1/r/processlist_priv_ps.result

@@ -32,7 +32,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `TIME` bigint(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
@@ -102,7 +102,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `TIME` bigint(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
 ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist

mysql-test/suite/funcs_1/r/processlist_val_no_prot.result

@@ -17,7 +17,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `TIME` bigint(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST;
 COUNT(*)
 1

mysql-test/suite/funcs_1/r/processlist_val_ps.result

@@ -17,7 +17,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `TIME` bigint(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST;
 COUNT(*)
 1

mysql-test/suite/funcs_1/t/is_columns.test

@@ -76,6 +76,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval SHOW COLUMNS FROM information_schema.$is_table;

mysql-test/suite/funcs_1/t/is_events.test

@@ -86,6 +86,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 #                     is associated.
 #
 eval DESCRIBE          information_schema.$is_table;
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 eval SHOW COLUMNS FROM information_schema.$is_table;
 

mysql-test/suite/funcs_1/t/is_routines.test

@@ -74,6 +74,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval SHOW COLUMNS FROM information_schema.$is_table;

mysql-test/suite/funcs_1/t/is_triggers.test

@@ -69,6 +69,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval SHOW COLUMNS FROM information_schema.$is_table;

mysql-test/suite/funcs_1/t/is_views.test

@@ -59,6 +59,7 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 eval SHOW CREATE TABLE information_schema.$is_table;
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval SHOW COLUMNS FROM information_schema.$is_table;

mysql-test/t/maria-no-logging.test

 # test of cases where we can safely disable logging
 
 --source include/have_maria.inc
+# can't restart server in embedded
+--source include/not_embedded.inc
 
 set global maria_log_file_size=4294967295;
 
@@ -9,7 +11,7 @@ drop database if exists mysqltest;
 --enable_warnings
 create database mysqltest;
 
-connect (admin, 127.0.0.1, root,,mysqltest,,);
+connect (admin, localhost, root,,mysqltest,,);
 --enable_reconnect
 
 connection default;

mysql-test/t/maria-purge.test

 -- source include/have_maria.inc
 -- source include/big_test.inc
+-- source include/not_embedded.inc
 
 # pre-requisites for maria_empty_logs
-connect (admin, 127.0.0.1, root,,test,,);
+connect (admin, localhost, root,,test,,);
 #
 --enable_reconnect
 connection default;

mysql-test/t/maria-recover-master.opt

---maria-recover=backup --maria-log-dir-path=../tmp
+--loose-maria-recover=backup --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp

mysql-test/t/maria-recover.test

@@ -48,7 +48,7 @@ EOF
 
 # line below will be removed
 disable_ps_protocol;
-replace_regex /.mysqltest.t_corrupted2/t_corrupted2/ ;
+replace_regex /Table.*t_corrupted2/t_corrupted2/ ;
 select * from t_corrupted2; # should show corruption and repair messages
 enable_ps_protocol;
 select * from t_corrupted2; # should show just rows

mysql-test/t/maria-recovery-big.test

@@ -20,7 +20,7 @@ let $mms_tname=t;
 # Include scripts can perform SQL. For it to not influence the main test
 # they use a separate connection. This way if they use a DDL it would
 # not autocommit in the main test.
-connect (admin, 127.0.0.1, root,,mysqltest,,);
+connect (admin, localhost, root,,mysqltest,,);
 --enable_reconnect
 
 connection default;

mysql-test/t/maria-recovery-bitmap.test

@@ -16,7 +16,7 @@ let $mms_tname=t;
 # Include scripts can perform SQL. For it to not influence the main test
 # they use a separate connection. This way if they use a DDL it would
 # not autocommit in the main test.
-connect (admin, 127.0.0.1, root,,mysqltest,,);
+connect (admin, localhost, root,,mysqltest,,);
 --enable_reconnect
 
 connection default;

mysql-test/t/maria-recovery-master.opt

---skip-stack-trace --skip-core-file --maria-log-dir-path=../tmp
+--skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp

mysql-test/t/maria-recovery-rtree-ft.test

@@ -19,7 +19,7 @@ let $mms_tname=t;
 # Include scripts can perform SQL. For it to not influence the main test
 # they use a separate connection. This way if they use a DDL it would
 # not autocommit in the main test.
-connect (admin, 127.0.0.1, root,,mysqltest,,);
+connect (admin, localhost, root,,mysqltest,,);
 --enable_reconnect
 
 connection default;

mysql-test/t/maria-recovery.test

@@ -17,7 +17,7 @@ let $mms_tname=t;
 # Include scripts can perform SQL. For it to not influence the main test
 # they use a separate connection. This way if they use a DDL it would
 # not autocommit in the main test.
-connect (admin, 127.0.0.1, root,,mysqltest,,);
+connect (admin, localhost, root,,mysqltest,,);
 --enable_reconnect
 
 connection default;

storage/maria/ma_delete.c

@@ -1523,8 +1523,8 @@ int _ma_write_undo_key_delete(MARIA_HA *info, const MARIA_KEY *key,
   return translog_write_record(res_lsn, log_type,
                                info->trn, info,
                                (translog_size_t)
-                               log_array[TRANSLOG_INTERNAL_PARTS + 0].length +
-                               log_array[TRANSLOG_INTERNAL_PARTS + 1].length,
+                               (log_array[TRANSLOG_INTERNAL_PARTS + 0].length +
+                                log_array[TRANSLOG_INTERNAL_PARTS + 1].length),
                                TRANSLOG_INTERNAL_PARTS + 2, log_array,
                                log_data + LSN_STORE_SIZE, &msg) ? -1 : 0;
 }