List:Maria Storage Engine« Previous MessageNext Message »
From:Guilhem Bichot Date:June 27 2008 1:30pm
Subject:bzr commit into mysql-6.0-maria branch (guilhem:2689)
View as plain text  
#At file:///home/mysql_src/bzrrepos/mysql-6.0-maria2/

 2689 Guilhem Bichot	2008-06-27
      Fix for "need_execute may be used uninitialized". Actually it may not, but gcc 4.1.2 -O3 believes so.
      Fix for Windows compiler warning. Fix for many simple test failures (ah, if we devs ran funcs1 suite).
modified:
  mysql-test/r/maria-recover.result
  mysql-test/suite/falcon/r/falcon_bug_22972.result
  mysql-test/suite/funcs_1/datadict/is_routines.inc
  mysql-test/suite/funcs_1/datadict/is_triggers.inc
  mysql-test/suite/funcs_1/datadict/is_views.inc
  mysql-test/suite/funcs_1/datadict/processlist_priv.inc
  mysql-test/suite/funcs_1/datadict/processlist_val.inc
  mysql-test/suite/funcs_1/datadict/tables2.inc
  mysql-test/suite/funcs_1/r/is_columns.result
  mysql-test/suite/funcs_1/r/is_events.result
  mysql-test/suite/funcs_1/r/is_routines.result
  mysql-test/suite/funcs_1/r/is_tables_is.result
  mysql-test/suite/funcs_1/r/is_triggers.result
  mysql-test/suite/funcs_1/r/is_views.result
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
  mysql-test/suite/funcs_1/t/is_columns.test
  mysql-test/suite/funcs_1/t/is_events.test
  mysql-test/t/maria-no-logging.test
  mysql-test/t/maria-purge.test
  mysql-test/t/maria-recover-master.opt
  mysql-test/t/maria-recover.test
  mysql-test/t/maria-recovery-big.test
  mysql-test/t/maria-recovery-bitmap.test
  mysql-test/t/maria-recovery-master.opt
  mysql-test/t/maria-recovery-rtree-ft.test
  mysql-test/t/maria-recovery.test
  sql/ha_ndbcluster.cc
  storage/maria/ma_delete.c

per-file messages:
  mysql-test/r/maria-recover.result
    replacement pattern changed
  mysql-test/suite/falcon/r/falcon_bug_22972.result
    There was this bug: in include/my_base.h in 6.0, two errors with same number:
    #define HA_ERR_CORRUPT_EVENT      172
    #define HA_ERR_NEW_FILE	          172
    In 6.0-maria we have fixed by changing the second to 173 and so all following ones by +1 too. That's why 177->178.
  mysql-test/suite/funcs_1/datadict/is_routines.inc
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/datadict/is_triggers.inc
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/datadict/is_views.inc
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/datadict/processlist_priv.inc
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/datadict/processlist_val.inc
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/datadict/tables2.inc
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/r/is_columns.result
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/r/is_events.result
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/r/is_routines.result
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/r/is_tables_is.result
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/r/is_triggers.result
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/r/is_views.result
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/t/is_columns.test
    internal tmp tables can be Maria now
  mysql-test/suite/funcs_1/t/is_events.test
    internal tmp tables can be Maria now
  mysql-test/t/maria-no-logging.test
    can't restart in embedded
  mysql-test/t/maria-purge.test
    can't restart in embedded. localhost is better for embedded.
  mysql-test/t/maria-recover-master.opt
    in embedded, process runs in mysql-test/, not in mysql-test/var/master-data
  mysql-test/t/maria-recover.test
    change replacement to work with embedded too (embedded runs in mysql-test/)
  mysql-test/t/maria-recovery-big.test
    localhost is better for embedded
  mysql-test/t/maria-recovery-bitmap.test
    localhost is better for embedded
  mysql-test/t/maria-recovery-master.opt
    in embedded, process runs in mysql-test/, not in mysql-test/var/master-data
  mysql-test/t/maria-recovery-rtree-ft.test
    localhost is better for embedded
  mysql-test/t/maria-recovery.test
    localhost is better for embedded
  sql/ha_ndbcluster.cc
    Fix for "need_execute may be used uninitialized". Actually it may not, but gcc believes so: it apparently
    says: "batch_copy_row_to_buffer() may not initialize it (when returning NULL)" and so if write_row() takes
    the 'if ((m_rows_to_insert > 1 && !uses_blobs) || batched_update ||...)' branch, need_execute may not be initialized
    and then be used in 'if (need_execute || primary_key_update)'". In fact if batch_copy_row_to_buffer() returns NULL,
    write_row() will return immediately and thus not reach the 'if (need_execute || primary_key_update)'.
  storage/maria/ma_delete.c
    Windows compiler complained about size_t->translog_size_t.
=== modified file 'mysql-test/r/maria-recover.result'
--- a/mysql-test/r/maria-recover.result	2008-06-16 08:57:25 +0000
+++ b/mysql-test/r/maria-recover.result	2008-06-27 13:30:49 +0000
@@ -24,7 +24,7 @@ select * from t_corrupted2;
 a
 ThursdayMorningsMarket
 Warnings:
-Error	145	Table '.t_corrupted2' is marked as crashed and should be repaired
+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	1034	1 client is using or hasn't closed the table properly
 Error	1034	Wrong base information on indexpage at page: 1

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_22972.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_22972.result	2008-04-03 09:58:19 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_22972.result	2008-06-27 13:30:49 +0000
@@ -5,6 +5,6 @@ DROP TABLE t1;
 ERROR 42S02: Unknown table 't1'
 SHOW WARNINGS;
 Level	Code	Message
-Error	177	Can't execute the given command because you have active locked tables or an active transaction
+Error	178	Can't execute the given command because you have active locked tables or an active transaction
 COMMIT;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/funcs_1/datadict/is_routines.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_routines.inc	2008-06-19 18:56:48 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_routines.inc	2008-06-27 13:30:49 +0000
@@ -75,6 +75,7 @@ eval SHOW TABLES FROM information_schema
 --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;

=== modified file 'mysql-test/suite/funcs_1/datadict/is_triggers.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_triggers.inc	2008-06-18 17:23:55 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_triggers.inc	2008-06-27 13:30:49 +0000
@@ -70,6 +70,7 @@ eval SHOW TABLES FROM information_schema
 --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;

=== modified file 'mysql-test/suite/funcs_1/datadict/is_views.inc'
--- a/mysql-test/suite/funcs_1/datadict/is_views.inc	2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/is_views.inc	2008-06-27 13:30:49 +0000
@@ -57,6 +57,7 @@ eval SHOW TABLES FROM information_schema
 --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;

=== modified file 'mysql-test/suite/funcs_1/datadict/processlist_priv.inc'
--- a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc	2008-04-26 23:52:43 +0000
+++ b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc	2008-06-27 13:30:49 +0000
@@ -112,6 +112,7 @@ connect (con100,localhost,ddicttestuser1
 --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 3 HOST_NAME 6 TIME
 eval SHOW $table;
@@ -128,6 +129,7 @@ eval SELECT $columns FROM $table $select
 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 3 HOST_NAME 6 TIME
 eval SHOW $table;

=== modified file 'mysql-test/suite/funcs_1/datadict/processlist_val.inc'
--- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc	2008-04-30 16:16:45 +0000
+++ b/mysql-test/suite/funcs_1/datadict/processlist_val.inc	2008-06-27 13:30:49 +0000
@@ -57,6 +57,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;
 
 

=== modified file 'mysql-test/suite/funcs_1/datadict/tables2.inc'
--- a/mysql-test/suite/funcs_1/datadict/tables2.inc	2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/datadict/tables2.inc	2008-06-27 13:30:49 +0000
@@ -31,6 +31,7 @@ let $ndb_pattern    = 'number_of_replica
 --vertical_results
 # We do not unify the engine name here, because the rowformat is
 # specific to the engine.
+--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 *,

=== modified file 'mysql-test/suite/funcs_1/r/is_columns.result'
--- a/mysql-test/suite/funcs_1/r/is_columns.result	2008-03-10 19:00:02 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns.result	2008-06-27 13:30:49 +0000
@@ -73,7 +73,7 @@ COLUMNS	CREATE TEMPORARY TABLE `COLUMNS`
   `COLUMN_COMMENT` varchar(1024) NOT NULL DEFAULT '',
   `STORAGE` varchar(8) NOT NULL DEFAULT '',
   `FORMAT` varchar(8) 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	

=== modified file 'mysql-test/suite/funcs_1/r/is_events.result'
--- a/mysql-test/suite/funcs_1/r/is_events.result	2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_events.result	2008-06-27 13:30:49 +0000
@@ -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	

=== modified file 'mysql-test/suite/funcs_1/r/is_routines.result'
--- a/mysql-test/suite/funcs_1/r/is_routines.result	2008-03-10 19:00:02 +0000
+++ b/mysql-test/suite/funcs_1/r/is_routines.result	2008-06-27 13:30:49 +0000
@@ -91,7 +91,7 @@ ROUTINES	CREATE TEMPORARY TABLE `ROUTINE
   `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			

=== modified file 'mysql-test/suite/funcs_1/r/is_tables_is.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_is.result	2008-06-19 18:56:48 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_is.result	2008-06-27 13:30:49 +0000
@@ -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	PARAMETERS
 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	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#
@@ -316,9 +316,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#
@@ -339,9 +339,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#
@@ -385,9 +385,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#
@@ -592,9 +592,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#
@@ -638,9 +638,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#
@@ -747,9 +747,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#
@@ -816,9 +816,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#
@@ -931,9 +931,9 @@ TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 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	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#
@@ -977,9 +977,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#
@@ -1000,9 +1000,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#
@@ -1046,9 +1046,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#
@@ -1253,9 +1253,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#
@@ -1299,9 +1299,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#

=== modified file 'mysql-test/suite/funcs_1/r/is_triggers.result'
--- a/mysql-test/suite/funcs_1/r/is_triggers.result	2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_triggers.result	2008-06-27 13:30:49 +0000
@@ -75,7 +75,7 @@ TRIGGERS	CREATE TEMPORARY TABLE `TRIGGER
   `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	

=== modified file 'mysql-test/suite/funcs_1/r/is_views.result'
--- a/mysql-test/suite/funcs_1/r/is_views.result	2008-03-07 19:18:14 +0000
+++ b/mysql-test/suite/funcs_1/r/is_views.result	2008-06-27 13:30:49 +0000
@@ -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	

=== modified file 'mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result'
--- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2008-04-27 18:13:00 +0000
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result	2008-06-27 13:30:49 +0000
@@ -32,7 +32,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
   `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	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist
@@ -102,7 +102,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
   `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	HOST_NAME	information_schema	Query	TIME	NULL	SHOW processlist

=== modified file 'mysql-test/suite/funcs_1/r/processlist_val_no_prot.result'
--- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result	2008-04-27 18:13:00 +0000
+++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result	2008-06-27 13:30:49 +0000
@@ -17,7 +17,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROC
   `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

=== modified file 'mysql-test/suite/funcs_1/t/is_columns.test'
--- a/mysql-test/suite/funcs_1/t/is_columns.test	2008-06-19 18:56:48 +0000
+++ b/mysql-test/suite/funcs_1/t/is_columns.test	2008-06-27 13:30:49 +0000
@@ -80,6 +80,7 @@ eval SHOW TABLES FROM information_schema
 --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;

=== modified file 'mysql-test/suite/funcs_1/t/is_events.test'
--- a/mysql-test/suite/funcs_1/t/is_events.test	2008-06-18 17:23:55 +0000
+++ b/mysql-test/suite/funcs_1/t/is_events.test	2008-06-27 13:30:49 +0000
@@ -89,6 +89,7 @@ eval SHOW TABLES FROM information_schema
 #                     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;
 

=== modified file 'mysql-test/t/maria-no-logging.test'
--- a/mysql-test/t/maria-no-logging.test	2008-06-06 13:37:16 +0000
+++ b/mysql-test/t/maria-no-logging.test	2008-06-27 13:30:49 +0000
@@ -1,6 +1,8 @@
 # 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;

=== modified file 'mysql-test/t/maria-purge.test'
--- a/mysql-test/t/maria-purge.test	2008-06-26 17:48:42 +0000
+++ b/mysql-test/t/maria-purge.test	2008-06-27 13:30:49 +0000
@@ -1,8 +1,9 @@
 -- 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;

=== modified file 'mysql-test/t/maria-recover-master.opt'
--- a/mysql-test/t/maria-recover-master.opt	2008-06-27 09:39:14 +0000
+++ b/mysql-test/t/maria-recover-master.opt	2008-06-27 13:30:49 +0000
@@ -1 +1 @@
---loose-maria-recover=backup --loose-maria-log-dir-path=../tmp
+--loose-maria-recover=backup --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp

=== modified file 'mysql-test/t/maria-recover.test'
--- a/mysql-test/t/maria-recover.test	2008-06-16 08:57:25 +0000
+++ b/mysql-test/t/maria-recover.test	2008-06-27 13:30:49 +0000
@@ -48,7 +48,7 @@ EOF
 
 # line below will be removed
 disable_ps_protocol;
-replace_regex /.mysqltest.t_corrupted2/t_corrupted2/ ;
+replace_regex /\..mysqltest.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

=== modified file 'mysql-test/t/maria-recovery-big.test'
--- a/mysql-test/t/maria-recovery-big.test	2008-06-02 20:53:25 +0000
+++ b/mysql-test/t/maria-recovery-big.test	2008-06-27 13:30:49 +0000
@@ -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;

=== modified file 'mysql-test/t/maria-recovery-bitmap.test'
--- a/mysql-test/t/maria-recovery-bitmap.test	2008-06-02 20:53:25 +0000
+++ b/mysql-test/t/maria-recovery-bitmap.test	2008-06-27 13:30:49 +0000
@@ -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;

=== modified file 'mysql-test/t/maria-recovery-master.opt'
--- a/mysql-test/t/maria-recovery-master.opt	2008-06-27 09:39:14 +0000
+++ b/mysql-test/t/maria-recovery-master.opt	2008-06-27 13:30:49 +0000
@@ -1 +1 @@
---skip-stack-trace --skip-core-file --loose-maria-log-dir-path=../tmp
+--skip-stack-trace --skip-core-file --loose-maria-log-dir-path=$MYSQLTEST_VARDIR/tmp

=== modified file 'mysql-test/t/maria-recovery-rtree-ft.test'
--- a/mysql-test/t/maria-recovery-rtree-ft.test	2008-06-02 20:53:25 +0000
+++ b/mysql-test/t/maria-recovery-rtree-ft.test	2008-06-27 13:30:49 +0000
@@ -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;

=== modified file 'mysql-test/t/maria-recovery.test'
--- a/mysql-test/t/maria-recovery.test	2008-06-02 20:53:25 +0000
+++ b/mysql-test/t/maria-recovery.test	2008-06-27 13:30:49 +0000
@@ -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;

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2008-06-05 16:11:22 +0000
+++ b/sql/ha_ndbcluster.cc	2008-06-27 13:30:49 +0000
@@ -678,7 +678,15 @@ ha_ndbcluster::batch_copy_row_to_buffer(
 {
   uchar *row= copy_row_to_buffer(thd_ndb, record);
   if (unlikely(!row))
+  {
+    /*
+      Initialize this because otherwise gcc believes that it can be used
+      uninitialized by callers (does not realize that if we return NULL then
+      callers don't use batch_full).
+    */
+    batch_full= FALSE;
     return NULL;
+  }
   uint unsent= thd_ndb->m_unsent_bytes;
   unsent+= m_bytes_per_write;
   batch_full= unsent >= BATCH_FLUSH_SIZE;
@@ -693,7 +701,10 @@ ha_ndbcluster::batch_copy_key_to_buffer(
 {
   uchar *row= alloc_batch_row(thd_ndb, key_len);
   if (unlikely(!row))
+  {
+    batch_full= FALSE; // see batch_copy_row_to_buffer
     return NULL;
+  }
   memcpy(row, key, key_len);
   uint unsent= thd_ndb->m_unsent_bytes;
   unsent+= op_batch_size;

=== modified file 'storage/maria/ma_delete.c'
--- a/storage/maria/ma_delete.c	2008-06-26 17:48:42 +0000
+++ b/storage/maria/ma_delete.c	2008-06-27 13:30:49 +0000
@@ -1523,8 +1523,8 @@ int _ma_write_undo_key_delete(MARIA_HA *
   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;
 }

Thread
bzr commit into mysql-6.0-maria branch (guilhem:2689) Guilhem Bichot27 Jun