portation fixes for bug 29536 and 29325 in

re-pushing for 5.1.22.


mysql-test/suite/rpl/t/rpl_timezone.test:
  typo fixed in re-pushing bug 29536
sql/mysqld.cc:
  portation fixes ->5.1 for bug 29325
This commit is contained in:
unknown 2007-08-27 15:01:29 +03:00
parent af9f7a239e
commit 2ed515528f
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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.",