From 240e9329e79c18d059094fbca1605536762dbbd7 Mon Sep 17 00:00:00 2001 From: "gkodinov/kgeorge@magare.gmz" <> Date: Mon, 27 Aug 2007 15:01:29 +0300 Subject: [PATCH] portation fixes for bug 29536 and 29325 in re-pushing for 5.1.22. --- mysql-test/suite/rpl/t/rpl_timezone.test | 2 +- sql/mysqld.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/rpl/t/rpl_timezone.test b/mysql-test/suite/rpl/t/rpl_timezone.test index c6ad7af7846..dac21000a62 100644 --- a/mysql-test/suite/rpl/t/rpl_timezone.test +++ b/mysql-test/suite/rpl/t/rpl_timezone.test @@ -139,7 +139,7 @@ sync_slave_with_master; # Restore original timezone connection master; -set global time_zone= @my_te_zone; +set global time_zone= @my_time_zone; --echo End of 4.1 tests diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 69db04ff210..d5336f5dd9c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5954,8 +5954,8 @@ log and this option does nothing anymore.", IO_SIZE, 0}, {"keep_files_on_create", OPT_KEEP_FILES_ON_CREATE, "Don't overwrite stale .MYD and .MYI even if no directory is specified.", - (gptr*) &global_system_variables.keep_files_on_create, - (gptr*) &max_system_variables.keep_files_on_create, + (uchar**) &global_system_variables.keep_files_on_create, + (uchar**) &max_system_variables.keep_files_on_create, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"key_buffer_size", OPT_KEY_BUFFER_SIZE, "The size of the buffer used for index blocks for MyISAM tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford; 64M on a 256M machine that mainly runs MySQL is quite common.",