database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

portation fixes for bug 29536 and 29325 in

Browse Source 
re-pushing for 5.1.22.
This commit is contained in:
gkodinov/kgeorge@magare.gmz
2007-08-27 15:01:29 +03:00
parent 424e70353f
commit 240e9329e7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/t/rpl_timezone.test
View File

@@ -139,7 +139,7 @@ sync_slave_with_master;
# Restore original timezone # Restore original timezone
connection master; connection master;
set global time_zone= @my_te_zone; set global time_zone= @my_time_zone;
--echo End of 4.1 tests --echo End of 4.1 tests

4
sql/mysqld.cc
View File

@@ -5954,8 +5954,8 @@ log and this option does nothing anymore.",
IO_SIZE, 0}, IO_SIZE, 0},
{"keep_files_on_create", OPT_KEEP_FILES_ON_CREATE, {"keep_files_on_create", OPT_KEEP_FILES_ON_CREATE,
"Don't overwrite stale .MYD and .MYI even if no directory is specified.", "Don't overwrite stale .MYD and .MYI even if no directory is specified.",
(gptr*) &global_system_variables.keep_files_on_create, (uchar**) &global_system_variables.keep_files_on_create,
(gptr*) &max_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}, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
{"key_buffer_size", OPT_KEY_BUFFER_SIZE, {"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.", "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.",