Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria

into  gbichot4.local:/home/mysql_src/mysql-maria-monty

mysql-test/mysql-test-run.pl

@@ -2178,6 +2178,22 @@ sub environment_setup () {
                         "$glob_basedir/storage/myisam/myisampack",
                         "$glob_basedir/myisam/myisampack"));
 
+  # ----------------------------------------------------
+  # Setup env so childs can execute maria_pack and maria_chk
+  # ----------------------------------------------------
+  $ENV{'MARIA_CHK'}= mtr_native_path(mtr_exe_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(
+                        vs_config_dirs('storage/maria', 'maria_pack'),
+                        vs_config_dirs('maria', 'maria_pack'),
+                        "$path_client_bindir/maria_pack",
+                        "$glob_basedir/storage/maria/maria_pack",
+                        "$glob_basedir/maria/maria_pack"));
+
   # ----------------------------------------------------
   # We are nice and report a bit about our settings
   # ----------------------------------------------------

mysql-test/t/create.test

@@ -1332,11 +1332,11 @@ drop function f1;
 # Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
 #
 create table t1 like information_schema.processlist;
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" ""
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 show create table t1;
 drop table t1;
 create temporary table t1 like information_schema.processlist;
---replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" ""
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" " PAGE_CHECKSUM=0" ""
 show create table t1;
 drop table t1;
 create table t1 like information_schema.character_sets;

mysql-test/t/disabled.def

@@ -24,4 +24,4 @@ wait_timeout         : Bug#32801 wait_timeout.test fails randomly
 ctype_create         : Bug#32965 main.ctype_create fails
 status               : Bug#32966 main.status fails
 ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
-maria-preload        : Bug#35030 unrepeatable output of SHOW STATUS
+maria-preload        : Bug#34911 unrepeatable output of SHOW STATUS

sql/sql_table.cc

@@ -5161,6 +5161,7 @@ compare_tables(TABLE *table,
       create_info->used_fields & HA_CREATE_USED_CHARSET ||
       create_info->used_fields & HA_CREATE_USED_DEFAULT_CHARSET ||
       create_info->used_fields & HA_CREATE_USED_ROW_FORMAT ||
+      create_info->used_fields & HA_CREATE_USED_PAGE_CHECKSUM ||
       (alter_info->flags & (ALTER_RECREATE | ALTER_FOREIGN_KEY)) ||
       order_num ||
       !table->s->mysql_version ||

storage/maria/ha_maria.cc

@@ -2343,8 +2343,10 @@ void ha_maria::update_create_info(HA_CREATE_INFO *create_info)
     Show always page checksums, as this can be forced with
     maria_page_checksums variable
   */
-  if (file->s->options & HA_OPTION_PAGE_CHECKSUM)
-    create_info->page_checksum= HA_CHOICE_YES;
+  if (create_info->page_checksum == HA_CHOICE_UNDEF)
+    create_info->page_checksum=
+      (file->s->options & HA_OPTION_PAGE_CHECKSUM) ? HA_CHOICE_YES :
+      HA_CHOICE_NO;
 }