2732 Horst Hunger 2009-01-22 [merge]
Changes to WL#4681 to merge to 5.1-main tree.
removed:
mysql-test/suite/parts/r/partition_bit_ndb.result
mysql-test/suite/parts/t/partition_bit_ndb.test
mysql-test/suite/parts/t/partition_sessions.test
mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result
mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func-master.opt
mysql-test/suite/sys_vars/t/rpl_init_slave_func-slave.opt
mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
added:
mysql-test/include/check_events_off.inc
mysql-test/include/cleanup_fake_relay_log.inc
mysql-test/include/have_simple_parser.inc
mysql-test/include/no_running_event_scheduler.inc
mysql-test/include/no_running_events.inc
mysql-test/include/running_event_scheduler.inc
mysql-test/include/setup_fake_relay_log.inc
mysql-test/include/wait_condition_sp.inc
mysql-test/r/fulltext_plugin.result
mysql-test/r/have_simple_parser.require
mysql-test/r/innodb_bug38231.result
mysql-test/r/innodb_bug39438.result
mysql-test/r/innodb_mysql_rbk.result
mysql-test/r/partition_innodb_semi_consistent.result
mysql-test/r/query_cache_28249.result
mysql-test/r/status2.result
mysql-test/std_data/bug40482-bin.000001
mysql-test/suite/binlog/r/binlog_innodb_row.result
mysql-test/suite/binlog/t/binlog_innodb_row.test
mysql-test/suite/rpl/r/rpl_binlog_corruption.result
mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt
mysql-test/suite/rpl/t/rpl_binlog_corruption.test
mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
mysql-test/t/fulltext_plugin-master.opt
mysql-test/t/fulltext_plugin.test
mysql-test/t/innodb_bug38231.test
mysql-test/t/innodb_bug39438-master.opt
mysql-test/t/innodb_bug39438.test
mysql-test/t/innodb_mysql_rbk-master.opt
mysql-test/t/innodb_mysql_rbk.test
mysql-test/t/partition_innodb_semi_consistent-master.opt
mysql-test/t/partition_innodb_semi_consistent.test
mysql-test/t/query_cache_28249.test
mysql-test/t/status2.test
renamed:
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
modified:
BUILD/compile-dist
CMakeLists.txt
Makefile.am
client/mysql.cc
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqlslap.c
client/mysqltest.c
config/ac-macros/ha_ndbcluster.m4
configure.in
extra/resolve_stack_dump.c
extra/yassl/include/openssl/ssl.h
include/config-win.h
include/hash.h
include/m_ctype.h
include/my_global.h
include/thr_lock.h
mysql-test/extra/binlog_tests/database.test
mysql-test/extra/rpl_tests/rpl_auto_increment.test
mysql-test/include/commit.inc
mysql-test/include/have_32bit.inc
mysql-test/include/have_64bit.inc
mysql-test/include/index_merge1.inc
mysql-test/include/linux_sys_vars.inc
mysql-test/include/wait_until_connected_again.inc
mysql-test/include/windows_sys_vars.inc
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/binlog_index.result
mysql-test/r/commit_1innodb.result
mysql-test/r/create.result
mysql-test/r/csv.result
mysql-test/r/ctype_ucs.result
mysql-test/r/date_formats.result
mysql-test/r/events_bugs.result
mysql-test/r/events_scheduling.result
mysql-test/r/fulltext.result
mysql-test/r/func_if.result
mysql-test/r/func_in.result
mysql-test/r/func_str.result
mysql-test/r/func_time.result
mysql-test/r/grant.result
mysql-test/r/index_merge_myisam.result
mysql-test/r/information_schema.result
mysql-test/r/innodb-autoinc.result
mysql-test/r/innodb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/log_state.result
mysql-test/r/myisampack.result
mysql-test/r/mysql.result
mysql-test/r/mysqlcheck.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_mgm.result
mysql-test/r/partition_pruning.result
mysql-test/r/query_cache.result
mysql-test/r/select.result
mysql-test/r/status.result
mysql-test/r/strict.result
mysql-test/r/temp_table.result
mysql-test/r/type_bit.result
mysql-test/r/type_date.result
mysql-test/r/type_float.result
mysql-test/r/warnings_engine_disabled.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_database.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/t/binlog_innodb.test
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_engines.result
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/storedproc/param_check.inc
mysql-test/suite/funcs_2/t/disabled.def
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/parts/r/partition_bit_innodb.result
mysql-test/suite/parts/r/partition_bit_myisam.result
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/parts/t/partition_special_innodb.test
mysql-test/suite/parts/t/partition_value_innodb.test
mysql-test/suite/parts/t/partition_value_myisam.test
mysql-test/suite/parts/t/partition_value_ndb.test
mysql-test/suite/rpl/r/rpl_auto_increment.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_row_create_table.result
mysql-test/suite/rpl/r/rpl_slave_skip.result
mysql-test/suite/rpl/r/rpl_trigger.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_row_create_table.test
mysql-test/suite/rpl/t/rpl_slave_skip.test
mysql-test/suite/rpl/t/rpl_trigger.test
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc
mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result
mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result
mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test
mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test
mysql-test/suite/sys_vars/t/rpl_init_slave_func.test
mysql-test/t/alter_table.test
mysql-test/t/create.test
mysql-test/t/csv.test
mysql-test/t/ctype_ucs.test
mysql-test/t/date_formats.test
mysql-test/t/disabled.def
mysql-test/t/events_bugs.test
mysql-test/t/events_scheduling.test
mysql-test/t/fulltext.test
mysql-test/t/func_if.test
mysql-test/t/func_in.test
mysql-test/t/func_str.test
mysql-test/t/func_time.test
mysql-test/t/grant.test
mysql-test/t/information_schema.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/innodb.test
mysql-test/t/innodb_mysql.test
mysql-test/t/log_state.test
mysql-test/t/myisampack.test
mysql-test/t/mysql.test
mysql-test/t/mysqlcheck.test
mysql-test/t/partition_innodb_stmt.test
mysql-test/t/partition_mgm.test
mysql-test/t/partition_pruning.test
mysql-test/t/query_cache.test
mysql-test/t/select.test
mysql-test/t/status.test
mysql-test/t/strict.test
mysql-test/t/temp_table.test
mysql-test/t/type_bit.test
mysql-test/t/type_date.test
mysql-test/t/type_float.test
mysql-test/t/warnings_engine_disabled.test
mysql-test/t/xml.test
mysys/hash.c
mysys/my_getopt.c
mysys/my_init.c
scripts/mysql_install_db.sh
sql-common/my_time.c
sql/event_db_repository.cc
sql/event_parse_data.cc
sql/event_parse_data.h
sql/field.cc
sql/field.h
sql/filesort.cc
sql/gen_lex_hash.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_func.h
sql/item_strfunc.cc
sql/item_sum.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/lock.cc
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/partition_info.cc
sql/partition_info.h
sql/repl_failsafe.cc
sql/rpl_constants.h
sql/set_var.cc
sql/slave.cc
sql/sp_head.cc
sql/spatial.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_binlog.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_cursor.cc
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_locale.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_profile.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_show.h
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_trigger.h
sql/sql_union.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/table.cc
sql/table.h
sql/unireg.cc
storage/archive/archive_reader.c
storage/blackhole/ha_blackhole.cc
storage/blackhole/ha_blackhole.h
storage/csv/ha_tina.cc
storage/federated/ha_federated.cc
storage/heap/ha_heap.cc
storage/innobase/Makefile.am
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0lru.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0mem.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/include/btr0sea.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0mem.h
storage/innobase/include/ha_prototypes.h
storage/innobase/include/lock0lock.h
storage/innobase/include/row0mysql.h
storage/innobase/include/sync0sync.ic
storage/innobase/include/ut0ut.h
storage/innobase/lock/lock0lock.c
storage/innobase/os/os0file.c
storage/innobase/plug.in
storage/innobase/row/row0mysql.c
storage/innobase/row/row0sel.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/ut/ut0ut.c
storage/myisam/ft_boolean_search.c
storage/myisam/myisampack.c
storage/ndb/docs/doxygen/postdoxy.pl
storage/ndb/test/run-test/atrt.hpp
storage/ndb/test/tools/connect.cpp
strings/conf_to_src.c
strings/ctype.c
strings/xml.c
support-files/my-small.cnf.sh
support-files/mysql.spec.sh
tests/mysql_client_test.c
win/configure.js
mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
=== renamed file 'mysql-test/include/charset_basic.inc' => 'mysql-test/suite/sys_vars/inc/charset_basic.inc'
=== renamed file 'mysql-test/include/collation_basic.inc' => 'mysql-test/suite/sys_vars/inc/collation_basic.inc'
=== modified file 'mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc 2008-12-19 15:03:32 +0000
@@ -36,7 +36,6 @@
###############################################################################
SET @start_value = @@global.query_cache_size;
-SELECT @start_value;
--echo '#--------------------FN_DYNVARS_133_01------------------------#'
###############################################################################
@@ -53,7 +52,7 @@ SELECT @@global.query_cache_size;
###############################################
SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = 0;
+SELECT @@global.query_cache_size = @start_value;
--echo '#--------------------FN_DYNVARS_133_03------------------------#'
################################################################################
@@ -167,7 +166,6 @@ SELECT query_cache_size = @@session.quer
##############################
SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size;
########################################################################
# END OF query_cache_size TESTS #
=== modified file 'mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc 2009-01-22 10:14:16 +0000
@@ -74,8 +74,8 @@ SELECT @@session.query_prealloc_size =
SET @@global.query_prealloc_size = 8192;
SELECT @@global.query_prealloc_size ;
-SET @@global.query_prealloc_size = 4294967295;
-SELECT @@global.query_prealloc_size ;
+#SET @@global.query_prealloc_size = 4294967295;
+#SELECT @@global.query_prealloc_size ;
SET @@global.query_prealloc_size = 655354;
SELECT @@global.query_prealloc_size ;
@@ -89,8 +89,8 @@ SELECT @@global.query_prealloc_size ;
SET @@session.query_prealloc_size = 8192;
SELECT @@session.query_prealloc_size ;
-SET @@session.query_prealloc_size = 4294967295;
-SELECT @@session.query_prealloc_size ;
+#SET @@session.query_prealloc_size = 4294967295;
+#SELECT @@session.query_prealloc_size ;
SET @@session.query_prealloc_size = 655345;
SELECT @@session.query_prealloc_size ;
@@ -106,11 +106,11 @@ SELECT @@session.query_prealloc_size ;
SET @@global.query_prealloc_size = 0;
SELECT @@global.query_prealloc_size ;
-SET @@global.query_prealloc_size = -1024;
-SELECT @@global.query_prealloc_size ;
+#SET @@global.query_prealloc_size = -1024;
+#SELECT @@global.query_prealloc_size ;
-SET @@global.query_prealloc_size = 429496729533;
-SELECT @@global.query_prealloc_size ;
+#SET @@global.query_prealloc_size = 429496729533;
+#SELECT @@global.query_prealloc_size ;
--Error ER_PARSE_ERROR
@@ -137,8 +137,8 @@ SELECT @@global.query_prealloc_size ;
SET @@session.query_prealloc_size = 0;
SELECT @@session.query_prealloc_size ;
-SET @@session.query_prealloc_size = -2;
-SELECT @@session.query_prealloc_size ;
+#SET @@session.query_prealloc_size = -2;
+#SELECT @@session.query_prealloc_size ;
--Error ER_PARSE_ERROR
=== modified file 'mysql-test/suite/sys_vars/inc/timestamp_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/timestamp_basic.inc 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/inc/timestamp_basic.inc 2008-12-19 15:03:32 +0000
@@ -18,8 +18,8 @@
# * Scope & Access method #
# * Data Integrity #
# #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
-# server-system-variables.html #
+# Reference: #
+# http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
# #
###############################################################################
@@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999
# Check if the value in SESSION Table matches value in variable #
#########################################################################
-SELECT @@timestamp = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='timestamp';
+# disabled due to bug#41584
+#SELECT @@timestamp = VARIABLE_VALUE
+#FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+#WHERE VARIABLE_NAME='timestamp';
--echo '#---------------------FN_DYNVARS_001_08-------------------------#'
#############################################################################
=== renamed file 'mysql-test/r/auto_commit_basic.result' => 'mysql-test/suite/sys_vars/r/auto_commit_basic.result'
=== renamed file 'mysql-test/r/auto_increment_increment_basic.result' => 'mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result'
=== renamed file 'mysql-test/r/auto_increment_increment_func.result' => 'mysql-test/suite/sys_vars/r/auto_increment_increment_func.result'
=== renamed file 'mysql-test/r/auto_increment_offset_basic.result' => 'mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result'
=== renamed file 'mysql-test/r/auto_increment_offset_func.result' => 'mysql-test/suite/sys_vars/r/auto_increment_offset_func.result'
=== renamed file 'mysql-test/r/autocommit_func.result' => 'mysql-test/suite/sys_vars/r/autocommit_func.result'
=== renamed file 'mysql-test/r/automatic_sp_privileges_basic.result' => 'mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result'
=== renamed file 'mysql-test/r/automatic_sp_privileges_func.result' => 'mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result'
=== renamed file 'mysql-test/r/basedir_basic.result' => 'mysql-test/suite/sys_vars/r/basedir_basic.result'
=== renamed file 'mysql-test/r/big_tables_basic.result' => 'mysql-test/suite/sys_vars/r/big_tables_basic.result'
=== renamed file 'mysql-test/r/binlog_format_basic.result' => 'mysql-test/suite/sys_vars/r/binlog_format_basic.result'
=== renamed file 'mysql-test/r/character_set_client_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_client_basic.result'
=== renamed file 'mysql-test/r/character_set_client_func.result' => 'mysql-test/suite/sys_vars/r/character_set_client_func.result'
=== renamed file 'mysql-test/r/character_set_connection_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_connection_basic.result'
=== renamed file 'mysql-test/r/character_set_connection_func.result' => 'mysql-test/suite/sys_vars/r/character_set_connection_func.result'
=== renamed file 'mysql-test/r/character_set_database_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_database_basic.result'
=== renamed file 'mysql-test/r/character_set_database_func.result' => 'mysql-test/suite/sys_vars/r/character_set_database_func.result'
=== renamed file 'mysql-test/r/character_set_filesystem_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result'
=== renamed file 'mysql-test/r/character_set_results_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_results_basic.result'
=== renamed file 'mysql-test/r/character_set_results_func.result' => 'mysql-test/suite/sys_vars/r/character_set_results_func.result'
=== renamed file 'mysql-test/r/character_set_server_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_server_basic.result'
=== renamed file 'mysql-test/r/character_set_server_func.result' => 'mysql-test/suite/sys_vars/r/character_set_server_func.result'
=== renamed file 'mysql-test/r/character_set_system_basic.result' => 'mysql-test/suite/sys_vars/r/character_set_system_basic.result'
=== renamed file 'mysql-test/r/collation_connection_basic.result' => 'mysql-test/suite/sys_vars/r/collation_connection_basic.result'
=== renamed file 'mysql-test/r/collation_connection_func.result' => 'mysql-test/suite/sys_vars/r/collation_connection_func.result'
=== renamed file 'mysql-test/r/collation_database_basic.result' => 'mysql-test/suite/sys_vars/r/collation_database_basic.result'
=== renamed file 'mysql-test/r/collation_database_func.result' => 'mysql-test/suite/sys_vars/r/collation_database_func.result'
=== renamed file 'mysql-test/r/collation_server_basic.result' => 'mysql-test/suite/sys_vars/r/collation_server_basic.result'
=== renamed file 'mysql-test/r/collation_server_func.result' => 'mysql-test/suite/sys_vars/r/collation_server_func.result'
=== renamed file 'mysql-test/r/completion_type_basic.result' => 'mysql-test/suite/sys_vars/r/completion_type_basic.result'
=== renamed file 'mysql-test/r/completion_type_func.result' => 'mysql-test/suite/sys_vars/r/completion_type_func.result'
=== renamed file 'mysql-test/r/concurrent_insert_basic.result' => 'mysql-test/suite/sys_vars/r/concurrent_insert_basic.result'
=== renamed file 'mysql-test/r/concurrent_insert_func.result' => 'mysql-test/suite/sys_vars/r/concurrent_insert_func.result'
=== renamed file 'mysql-test/r/connect_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/connect_timeout_basic.result'
=== renamed file 'mysql-test/r/datadir_basic.result' => 'mysql-test/suite/sys_vars/r/datadir_basic.result'
=== renamed file 'mysql-test/r/default_week_format_basic.result' => 'mysql-test/suite/sys_vars/r/default_week_format_basic.result'
=== renamed file 'mysql-test/r/default_week_format_func.result' => 'mysql-test/suite/sys_vars/r/default_week_format_func.result'
=== renamed file 'mysql-test/r/delay_key_write_basic.result' => 'mysql-test/suite/sys_vars/r/delay_key_write_basic.result'
=== renamed file 'mysql-test/r/delay_key_write_func.result' => 'mysql-test/suite/sys_vars/r/delay_key_write_func.result'
=== renamed file 'mysql-test/r/delayed_insert_limit_func.result' => 'mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result'
=== renamed file 'mysql-test/r/delayed_insert_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result'
=== renamed file 'mysql-test/r/div_precision_increment_basic.result' => 'mysql-test/suite/sys_vars/r/div_precision_increment_basic.result'
=== renamed file 'mysql-test/r/div_precision_increment_func.result' => 'mysql-test/suite/sys_vars/r/div_precision_increment_func.result'
=== renamed file 'mysql-test/r/engine_condition_pushdown_basic.result' => 'mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result'
=== renamed file 'mysql-test/r/error_count_basic.result' => 'mysql-test/suite/sys_vars/r/error_count_basic.result'
=== renamed file 'mysql-test/r/event_scheduler_basic.result' => 'mysql-test/suite/sys_vars/r/event_scheduler_basic.result'
=== renamed file 'mysql-test/r/event_scheduler_func.result' => 'mysql-test/suite/sys_vars/r/event_scheduler_func.result'
=== renamed file 'mysql-test/r/expire_logs_days_basic.result' => 'mysql-test/suite/sys_vars/r/expire_logs_days_basic.result'
=== renamed file 'mysql-test/r/flush_basic.result' => 'mysql-test/suite/sys_vars/r/flush_basic.result'
=== renamed file 'mysql-test/r/foreign_key_checks_basic.result' => 'mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result'
=== renamed file 'mysql-test/r/foreign_key_checks_func.result' => 'mysql-test/suite/sys_vars/r/foreign_key_checks_func.result'
=== renamed file 'mysql-test/r/ft_boolean_syntax_basic.result' => 'mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result'
=== renamed file 'mysql-test/r/ft_boolean_syntax_func.result' => 'mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result'
=== renamed file 'mysql-test/r/general_log_basic.result' => 'mysql-test/suite/sys_vars/r/general_log_basic.result'
=== renamed file 'mysql-test/r/general_log_file_basic.result' => 'mysql-test/suite/sys_vars/r/general_log_file_basic.result'
=== renamed file 'mysql-test/r/general_log_file_func.result' => 'mysql-test/suite/sys_vars/r/general_log_file_func.result'
=== renamed file 'mysql-test/r/general_log_func.result' => 'mysql-test/suite/sys_vars/r/general_log_func.result'
=== renamed file 'mysql-test/r/group_concat_max_len_basic.result' => 'mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result'
=== renamed file 'mysql-test/r/group_concat_max_len_func.result' => 'mysql-test/suite/sys_vars/r/group_concat_max_len_func.result'
=== renamed file 'mysql-test/r/have_compress_basic.result' => 'mysql-test/suite/sys_vars/r/have_compress_basic.result'
=== renamed file 'mysql-test/r/have_crypt_basic.result' => 'mysql-test/suite/sys_vars/r/have_crypt_basic.result'
=== renamed file 'mysql-test/r/have_csv_basic.result' => 'mysql-test/suite/sys_vars/r/have_csv_basic.result'
=== renamed file 'mysql-test/r/have_dynamic_loading_basic.result' => 'mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result'
=== renamed file 'mysql-test/r/have_geometry_basic.result' => 'mysql-test/suite/sys_vars/r/have_geometry_basic.result'
=== renamed file 'mysql-test/r/have_innodb_basic.result' => 'mysql-test/suite/sys_vars/r/have_innodb_basic.result'
=== renamed file 'mysql-test/r/have_ndbcluster_basic.result' => 'mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result'
=== renamed file 'mysql-test/r/have_openssl_basic.result' => 'mysql-test/suite/sys_vars/r/have_openssl_basic.result'
=== renamed file 'mysql-test/r/have_partitioning_basic.result' => 'mysql-test/suite/sys_vars/r/have_partitioning_basic.result'
=== renamed file 'mysql-test/r/have_query_cache_basic.result' => 'mysql-test/suite/sys_vars/r/have_query_cache_basic.result'
=== renamed file 'mysql-test/r/have_rtree_keys_basic.result' => 'mysql-test/suite/sys_vars/r/have_rtree_keys_basic.result'
=== renamed file 'mysql-test/r/have_ssl_basic.result' => 'mysql-test/suite/sys_vars/r/have_ssl_basic.result'
=== renamed file 'mysql-test/r/have_symlink_basic.result' => 'mysql-test/suite/sys_vars/r/have_symlink_basic.result'
=== renamed file 'mysql-test/r/hostname_basic.result' => 'mysql-test/suite/sys_vars/r/hostname_basic.result'
=== renamed file 'mysql-test/r/identity_basic.result' => 'mysql-test/suite/sys_vars/r/identity_basic.result'
=== renamed file 'mysql-test/r/identity_func.result' => 'mysql-test/suite/sys_vars/r/identity_func.result'
=== renamed file 'mysql-test/r/init_connect_basic.result' => 'mysql-test/suite/sys_vars/r/init_connect_basic.result'
=== renamed file 'mysql-test/r/init_slave_basic.result' => 'mysql-test/suite/sys_vars/r/init_slave_basic.result'
=== renamed file 'mysql-test/r/innodb_additional_mem_pool_size_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_additional_mem_pool_size_basic.result'
=== renamed file 'mysql-test/r/innodb_autoextend_increment_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result'
=== renamed file 'mysql-test/r/innodb_autoinc_lock_mode_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_basic.result'
=== renamed file 'mysql-test/r/innodb_autoinc_lock_mode_func.result' => 'mysql-test/suite/sys_vars/r/innodb_autoinc_lock_mode_func.result'
=== renamed file 'mysql-test/r/innodb_buffer_pool_size_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result'
=== renamed file 'mysql-test/r/innodb_checksums_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_checksums_basic.result'
=== renamed file 'mysql-test/r/innodb_commit_concurrency_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result'
=== renamed file 'mysql-test/r/innodb_data_file_path_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result'
=== renamed file 'mysql-test/r/innodb_data_home_dir_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result'
=== renamed file 'mysql-test/r/innodb_doublewrite_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result'
=== renamed file 'mysql-test/r/innodb_fast_shutdown_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result'
=== renamed file 'mysql-test/r/innodb_file_io_threads_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result'
=== renamed file 'mysql-test/r/innodb_file_per_table_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result'
=== renamed file 'mysql-test/r/innodb_flush_log_at_trx_commit_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result'
=== renamed file 'mysql-test/r/innodb_flush_method_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_flush_method_basic.result'
=== renamed file 'mysql-test/r/innodb_force_recovery_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_force_recovery_basic.result'
=== renamed file 'mysql-test/r/innodb_lock_wait_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result'
=== renamed file 'mysql-test/r/innodb_locks_unsafe_for_binlog_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result'
=== renamed file 'mysql-test/r/innodb_log_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_log_buffer_size_basic.result'
=== renamed file 'mysql-test/r/innodb_log_file_size_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_log_file_size_basic.result'
=== renamed file 'mysql-test/r/innodb_log_files_in_group_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_log_files_in_group_basic.result'
=== renamed file 'mysql-test/r/innodb_log_group_home_dir_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result'
=== renamed file 'mysql-test/r/innodb_max_dirty_pages_pct_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result'
=== renamed file 'mysql-test/r/innodb_max_dirty_pages_pct_func.result' => 'mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_func.result'
=== renamed file 'mysql-test/r/innodb_mirrored_log_groups_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_mirrored_log_groups_basic.result'
=== renamed file 'mysql-test/r/innodb_open_files_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_open_files_basic.result'
=== renamed file 'mysql-test/r/innodb_rollback_on_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result'
=== renamed file 'mysql-test/r/innodb_support_xa_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result'
=== renamed file 'mysql-test/r/innodb_support_xa_func.result' => 'mysql-test/suite/sys_vars/r/innodb_support_xa_func.result'
=== renamed file 'mysql-test/r/innodb_table_locks_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result'
=== renamed file 'mysql-test/r/innodb_table_locks_func.result' => 'mysql-test/suite/sys_vars/r/innodb_table_locks_func.result'
=== renamed file 'mysql-test/r/innodb_thread_concurrency_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result'
=== renamed file 'mysql-test/r/innodb_thread_sleep_delay_basic.result' => 'mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result'
=== renamed file 'mysql-test/r/insert_id_basic.result' => 'mysql-test/suite/sys_vars/r/insert_id_basic.result'
=== renamed file 'mysql-test/r/insert_id_func.result' => 'mysql-test/suite/sys_vars/r/insert_id_func.result'
=== renamed file 'mysql-test/r/interactive_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/interactive_timeout_basic.result'
=== renamed file 'mysql-test/r/interactive_timeout_func.result' => 'mysql-test/suite/sys_vars/r/interactive_timeout_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result 2009-01-22 10:14:16 +0000
@@ -42,6 +42,8 @@ SELECT @@global.join_buffer_size;
@@global.join_buffer_size
65536
SET @@global.join_buffer_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect join_buffer_size value: '4294967295'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
4294963200
@@ -58,6 +60,8 @@ SELECT @@session.join_buffer_size;
@@session.join_buffer_size
65536
SET @@session.join_buffer_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect join_buffer_size value: '4294967295'
SELECT @@session.join_buffer_size;
@@session.join_buffer_size
4294963200
=== renamed file 'mysql-test/r/keep_files_on_create_basic.result' => 'mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result'
=== renamed file 'mysql-test/r/key_buffer_size_func.result' => 'mysql-test/suite/sys_vars/r/key_buffer_size_func.result'
=== renamed file 'mysql-test/r/last_insert_id_func.result' => 'mysql-test/suite/sys_vars/r/last_insert_id_func.result'
=== renamed file 'mysql-test/r/lc_time_names_basic.result' => 'mysql-test/suite/sys_vars/r/lc_time_names_basic.result'
=== renamed file 'mysql-test/r/lc_time_names_func.result' => 'mysql-test/suite/sys_vars/r/lc_time_names_func.result'
=== renamed file 'mysql-test/r/license_basic.result' => 'mysql-test/suite/sys_vars/r/license_basic.result'
=== renamed file 'mysql-test/r/local_infile_basic.result' => 'mysql-test/suite/sys_vars/r/local_infile_basic.result'
=== renamed file 'mysql-test/r/local_infile_func.result' => 'mysql-test/suite/sys_vars/r/local_infile_func.result'
=== renamed file 'mysql-test/r/log_basic.result' => 'mysql-test/suite/sys_vars/r/log_basic.result'
=== renamed file 'mysql-test/r/log_bin_trust_function_creators_basic.result' => 'mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result'
=== renamed file 'mysql-test/r/log_bin_trust_function_creators_func.result' => 'mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_func.result'
=== renamed file 'mysql-test/r/log_bin_trust_routine_creators_basic.result' => 'mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result'
=== renamed file 'mysql-test/r/log_output_basic.result' => 'mysql-test/suite/sys_vars/r/log_output_basic.result'
=== renamed file 'mysql-test/r/log_output_func.result' => 'mysql-test/suite/sys_vars/r/log_output_func.result'
=== renamed file 'mysql-test/r/log_queries_not_using_indexes_basic.result' => 'mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result'
=== modified file 'mysql-test/suite/sys_vars/r/log_warnings_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result 2009-01-22 10:14:16 +0000
@@ -71,7 +71,7 @@ SELECT @@session.log_warnings;
'#------------------FN_DYNVARS_067_05-----------------------#'
SET @@global.log_warnings = 100000000000;
Warnings:
-Warning 1292 Truncated incorrect log-warnings value: '100000000000'
+Warning 1292 Truncated incorrect log_warnings value: '100000000000'
SELECT @@global.log_warnings;
@@global.log_warnings
4294967295
@@ -91,7 +91,7 @@ SELECT @@global.log_warnings;
0
SET @@session.log_warnings = 100000000000;
Warnings:
-Warning 1292 Truncated incorrect log-warnings value: '100000000000'
+Warning 1292 Truncated incorrect log_warnings value: '100000000000'
SELECT @@session.log_warnings;
@@session.log_warnings
4294967295
=== renamed file 'mysql-test/r/long_query_time_basic.result' => 'mysql-test/suite/sys_vars/r/long_query_time_basic.result'
=== renamed file 'mysql-test/r/low_priority_updates_basic.result' => 'mysql-test/suite/sys_vars/r/low_priority_updates_basic.result'
=== renamed file 'mysql-test/r/max_allowed_packet_basic.result' => 'mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result'
=== renamed file 'mysql-test/r/max_allowed_packet_func.result' => 'mysql-test/suite/sys_vars/r/max_allowed_packet_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result 2009-01-22 10:14:16 +0000
@@ -1,7 +1,7 @@
SET @start_value = @@global.max_binlog_cache_size;
SELECT @start_value;
@start_value
-4294967295
+4294963200
'#--------------------FN_DYNVARS_072_01------------------------#'
SET @@global.max_binlog_cache_size = 5000;
SET @@global.max_binlog_cache_size = DEFAULT;
=== renamed file 'mysql-test/r/max_binlog_cache_size_func.result' => 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_func.result'
=== renamed file 'mysql-test/r/max_binlog_size_basic.result' => 'mysql-test/suite/sys_vars/r/max_binlog_size_basic.result'
=== renamed file 'mysql-test/r/max_connections_basic.result' => 'mysql-test/suite/sys_vars/r/max_connections_basic.result'
=== renamed file 'mysql-test/r/max_delayed_threads_basic.result' => 'mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result'
=== renamed file 'mysql-test/r/max_error_count_basic.result' => 'mysql-test/suite/sys_vars/r/max_error_count_basic.result'
=== renamed file 'mysql-test/r/max_insert_delayed_threads_basic.result' => 'mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result'
=== renamed file 'mysql-test/r/max_join_size_func.result' => 'mysql-test/suite/sys_vars/r/max_join_size_func.result'
=== renamed file 'mysql-test/r/max_length_for_sort_data_basic.result' => 'mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result'
=== renamed file 'mysql-test/r/max_prepared_stmt_count_basic.result' => 'mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result'
=== renamed file 'mysql-test/r/max_prepared_stmt_count_func.result' => 'mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result'
=== renamed file 'mysql-test/r/max_relay_log_size_basic.result' => 'mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result'
=== renamed file 'mysql-test/r/max_seeks_for_key_func.result' => 'mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result'
=== renamed file 'mysql-test/r/max_sort_length_basic.result' => 'mysql-test/suite/sys_vars/r/max_sort_length_basic.result'
=== renamed file 'mysql-test/r/max_sort_length_func.result' => 'mysql-test/suite/sys_vars/r/max_sort_length_func.result'
=== renamed file 'mysql-test/r/max_sp_recursion_depth_basic.result' => 'mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result'
=== renamed file 'mysql-test/r/max_sp_recursion_depth_func.result' => 'mysql-test/suite/sys_vars/r/max_sp_recursion_depth_func.result'
=== renamed file 'mysql-test/r/max_user_connections_basic.result' => 'mysql-test/suite/sys_vars/r/max_user_connections_basic.result'
=== renamed file 'mysql-test/r/max_user_connections_func.result' => 'mysql-test/suite/sys_vars/r/max_user_connections_func.result'
=== renamed file 'mysql-test/r/myisam_data_pointer_size_basic.result' => 'mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result'
=== renamed file 'mysql-test/r/myisam_data_pointer_size_func.result' => 'mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result 2009-01-22 10:14:16 +0000
@@ -1,7 +1,7 @@
SET @start_global_value = @@global.myisam_max_sort_file_size;
SELECT @start_global_value;
@start_global_value
-2147483647
+2146435072
'#--------------------FN_DYNVARS_094_01-------------------------#'
SET @@global.myisam_max_sort_file_size = 500000;
SET @@global.myisam_max_sort_file_size = DEFAULT;
=== renamed file 'mysql-test/r/myisam_sort_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result'
=== renamed file 'mysql-test/r/myisam_stats_method_basic.result' => 'mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result'
=== renamed file 'mysql-test/r/myisam_stats_method_func.result' => 'mysql-test/suite/sys_vars/r/myisam_stats_method_func.result'
=== renamed file 'mysql-test/r/myisam_use_mmap_basic.result' => 'mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result'
=== renamed file 'mysql-test/r/ndb_log_update_as_write_basic.result' => 'mysql-test/suite/sys_vars/r/ndb_log_update_as_write_basic.result'
=== renamed file 'mysql-test/r/ndb_log_updated_only_basic.result' => 'mysql-test/suite/sys_vars/r/ndb_log_updated_only_basic.result'
=== renamed file 'mysql-test/r/net_buffer_length_basic.result' => 'mysql-test/suite/sys_vars/r/net_buffer_length_basic.result'
=== renamed file 'mysql-test/r/net_read_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/net_read_timeout_basic.result'
=== renamed file 'mysql-test/r/net_write_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/net_write_timeout_basic.result'
=== renamed file 'mysql-test/r/new_basic.result' => 'mysql-test/suite/sys_vars/r/new_basic.result'
=== renamed file 'mysql-test/r/old_passwords_basic.result' => 'mysql-test/suite/sys_vars/r/old_passwords_basic.result'
=== renamed file 'mysql-test/r/old_passwords_func.result' => 'mysql-test/suite/sys_vars/r/old_passwords_func.result'
=== renamed file 'mysql-test/r/optimizer_prune_level_basic.result' => 'mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result'
=== renamed file 'mysql-test/r/optimizer_search_depth_basic.result' => 'mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result'
=== renamed file 'mysql-test/r/preload_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result'
=== modified file 'mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result 2009-01-22 10:14:16 +0000
@@ -36,10 +36,14 @@ SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
1024
SET @@global.query_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
SET @@global.query_alloc_block_size = 4294967294;
+Warnings:
+Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
4294966272
@@ -58,10 +62,14 @@ SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
1024
SET @@session.query_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295'
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
4294966272
SET @@session.query_alloc_block_size = 4294967294;
+Warnings:
+Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294'
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
4294966272
=== renamed file 'mysql-test/r/query_cache_limit_func.result' => 'mysql-test/suite/sys_vars/r/query_cache_limit_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result 2009-01-22 10:14:16 +0000
@@ -1,7 +1,4 @@
SET @start_value = @@global.query_cache_size;
-SELECT @start_value;
-@start_value
-0
'#--------------------FN_DYNVARS_133_01------------------------#'
SET @@global.query_cache_size = 99;
SET @@global.query_cache_size = DEFAULT;
@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size;
0
'#---------------------FN_DYNVARS_133_02-------------------------#'
SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = 0;
-@@global.query_cache_size = 0
+SELECT @@global.query_cache_size = @start_value;
+@@global.query_cache_size = @start_value
1
'#--------------------FN_DYNVARS_133_03------------------------#'
SET @@global.query_cache_size = 0;
@@ -133,6 +130,3 @@ ERROR 42S02: Unknown table 'global' in f
SELECT query_cache_size = @@session.query_cache_size;
ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
=== modified file 'mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result 2008-12-19 15:03:32 +0000
@@ -1,7 +1,4 @@
SET @start_value = @@global.query_cache_size;
-SELECT @start_value;
-@start_value
-0
'#--------------------FN_DYNVARS_133_01------------------------#'
SET @@global.query_cache_size = 99;
SET @@global.query_cache_size = DEFAULT;
@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size;
0
'#---------------------FN_DYNVARS_133_02-------------------------#'
SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size = 0;
-@@global.query_cache_size = 0
+SELECT @@global.query_cache_size = @start_value;
+@@global.query_cache_size = @start_value
1
'#--------------------FN_DYNVARS_133_03------------------------#'
SET @@global.query_cache_size = 0;
@@ -129,6 +126,3 @@ ERROR 42S02: Unknown table 'global' in f
SELECT query_cache_size = @@session.query_cache_size;
ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
SET @@global.query_cache_size = @start_value;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
=== renamed file 'mysql-test/r/query_cache_type_basic.result' => 'mysql-test/suite/sys_vars/r/query_cache_type_basic.result'
=== renamed file 'mysql-test/r/query_cache_type_func.result' => 'mysql-test/suite/sys_vars/r/query_cache_type_func.result'
=== renamed file 'mysql-test/r/query_cache_wlock_invalidate_basic.result' => 'mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result'
=== renamed file 'mysql-test/r/query_cache_wlock_invalidate_func.result' => 'mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result 2009-01-22 10:14:16 +0000
@@ -35,10 +35,6 @@ SET @@global.query_prealloc_size = 819
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
8192
-SET @@global.query_prealloc_size = 4294967295;
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-4294966272
SET @@global.query_prealloc_size = 655354;
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
@@ -48,10 +44,6 @@ SET @@session.query_prealloc_size = 81
SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size
8192
-SET @@session.query_prealloc_size = 4294967295;
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
-4294966272
SET @@session.query_prealloc_size = 655345;
SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size
@@ -63,50 +55,32 @@ Warning 1292 Truncated incorrect query_p
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
8192
-SET @@global.query_prealloc_size = -1024;
-Warnings:
-Warning 1292 Truncated incorrect query_prealloc_size value: '0'
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-8192
-SET @@global.query_prealloc_size = 429496729533;
-Warnings:
-Warning 1292 Truncated incorrect query_prealloc_size value: '429496729533'
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-4294966272
SET @@global.query_prealloc_size = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-4294966272
+8192
SET @@global.query_prealloc_size = test;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-4294966272
+8192
SET @@global.query_prealloc_size = "test";
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-4294966272
+8192
SET @@global.query_prealloc_size = 'test';
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-4294966272
+8192
SET @@global.query_prealloc_size = ON;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-4294966272
-SET @@session.query_prealloc_size = 0;
-Warnings:
-Warning 1292 Truncated incorrect query_prealloc_size value: '0'
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
8192
-SET @@session.query_prealloc_size = -2;
+SET @@session.query_prealloc_size = 0;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '0'
SELECT @@session.query_prealloc_size ;
=== renamed file 'mysql-test/r/query_prealloc_size_func.result' => 'mysql-test/suite/sys_vars/r/query_prealloc_size_func.result'
=== modified file 'mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result 2009-01-22 10:14:16 +0000
@@ -39,10 +39,14 @@ SELECT @@global.range_alloc_block_size;
4096
'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
SET @@global.range_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967295'
SELECT @@global.range_alloc_block_size;
@@global.range_alloc_block_size
4294966272
SET @@global.range_alloc_block_size = 4294967294;
+Warnings:
+Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967294'
SELECT @@global.range_alloc_block_size;
@@global.range_alloc_block_size
4294966272
@@ -55,10 +59,14 @@ SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size
4096
SET @@session.range_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967295'
SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size
4294966272
SET @@session.range_alloc_block_size = 4294967294;
+Warnings:
+Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967294'
SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size
4294966272
=== renamed file 'mysql-test/r/read_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/read_buffer_size_basic.result'
=== renamed file 'mysql-test/r/read_only_basic.result' => 'mysql-test/suite/sys_vars/r/read_only_basic.result'
=== renamed file 'mysql-test/r/read_only_func.result' => 'mysql-test/suite/sys_vars/r/read_only_func.result'
=== renamed file 'mysql-test/r/read_rnd_buffer_size_basic.result' => 'mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result'
=== renamed file 'mysql-test/r/relay_log_purge_basic.result' => 'mysql-test/suite/sys_vars/r/relay_log_purge_basic.result'
=== renamed file 'mysql-test/r/rpl_init_slave_func.result' => 'mysql-test/suite/sys_vars/r/rpl_init_slave_func.result'
=== renamed file 'mysql-test/r/rpl_max_binlog_size_func.result' => 'mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result'
--- a/mysql-test/r/rpl_max_binlog_size_func.result 2008-04-10 13:14:28 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result 2008-12-19 15:12:15 +0000
@@ -3,3 +3,4 @@ DROP TABLE IF EXISTS t1;
SET @@global.max_binlog_size = 4096;
CREATE TABLE t1(a CHAR(5));
'mylog.000002 exists'
+DROP TABLE t1;
=== renamed file 'mysql-test/r/secure_auth_basic.result' => 'mysql-test/suite/sys_vars/r/secure_auth_basic.result'
=== renamed file 'mysql-test/r/secure_auth_func.result' => 'mysql-test/suite/sys_vars/r/secure_auth_func.result'
=== renamed file 'mysql-test/r/slave_allow_batching_basic.result' => 'mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result'
=== renamed file 'mysql-test/r/slave_compressed_protocol_basic.result' => 'mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result'
=== renamed file 'mysql-test/r/slave_exec_mode_basic.result' => 'mysql-test/suite/sys_vars/r/slave_exec_mode_basic.result'
=== renamed file 'mysql-test/r/slave_net_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result'
=== renamed file 'mysql-test/r/slow_launch_time_basic.result' => 'mysql-test/suite/sys_vars/r/slow_launch_time_basic.result'
=== renamed file 'mysql-test/r/slow_launch_time_func.result' => 'mysql-test/suite/sys_vars/r/slow_launch_time_func.result'
=== renamed file 'mysql-test/r/slow_query_log_basic.result' => 'mysql-test/suite/sys_vars/r/slow_query_log_basic.result'
=== renamed file 'mysql-test/r/slow_query_log_file_basic.result' => 'mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result'
=== renamed file 'mysql-test/r/slow_query_log_file_func.result' => 'mysql-test/suite/sys_vars/r/slow_query_log_file_func.result'
=== renamed file 'mysql-test/r/slow_query_log_func.result' => 'mysql-test/suite/sys_vars/r/slow_query_log_func.result'
=== renamed file 'mysql-test/r/sql_auto_is_null_basic.result' => 'mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result'
=== renamed file 'mysql-test/r/sql_big_selects_basic.result' => 'mysql-test/suite/sys_vars/r/sql_big_selects_basic.result'
=== renamed file 'mysql-test/r/sql_big_selects_func.result' => 'mysql-test/suite/sys_vars/r/sql_big_selects_func.result'
=== renamed file 'mysql-test/r/sql_big_tables_basic.result' => 'mysql-test/suite/sys_vars/r/sql_big_tables_basic.result'
=== renamed file 'mysql-test/r/sql_big_tables_func.result' => 'mysql-test/suite/sys_vars/r/sql_big_tables_func.result'
=== renamed file 'mysql-test/r/sql_buffer_result_basic.result' => 'mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result'
=== renamed file 'mysql-test/r/sql_buffer_result_func.result' => 'mysql-test/suite/sys_vars/r/sql_buffer_result_func.result'
=== renamed file 'mysql-test/r/sql_log_bin_basic.result' => 'mysql-test/suite/sys_vars/r/sql_log_bin_basic.result'
=== renamed file 'mysql-test/r/sql_log_off_basic.result' => 'mysql-test/suite/sys_vars/r/sql_log_off_basic.result'
=== renamed file 'mysql-test/r/sql_log_off_func.result' => 'mysql-test/suite/sys_vars/r/sql_log_off_func.result'
=== renamed file 'mysql-test/r/sql_low_priority_updates_basic.result' => 'mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result'
=== renamed file 'mysql-test/r/sql_low_priority_updates_func.result' => 'mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result'
=== renamed file 'mysql-test/r/sql_max_join_size_func.result' => 'mysql-test/suite/sys_vars/r/sql_max_join_size_func.result'
=== renamed file 'mysql-test/r/sql_mode_basic.result' => 'mysql-test/suite/sys_vars/r/sql_mode_basic.result'
=== renamed file 'mysql-test/r/sql_mode_func.result' => 'mysql-test/suite/sys_vars/r/sql_mode_func.result'
=== renamed file 'mysql-test/r/sql_notes_basic.result' => 'mysql-test/suite/sys_vars/r/sql_notes_basic.result'
=== renamed file 'mysql-test/r/sql_notes_func.result' => 'mysql-test/suite/sys_vars/r/sql_notes_func.result'
=== renamed file 'mysql-test/r/sql_quote_show_create_basic.result' => 'mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result'
=== renamed file 'mysql-test/r/sql_quote_show_create_func.result' => 'mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result'
=== renamed file 'mysql-test/r/sql_safe_updates_basic.result' => 'mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result'
=== renamed file 'mysql-test/r/sql_safe_updates_func.result' => 'mysql-test/suite/sys_vars/r/sql_safe_updates_func.result'
=== renamed file 'mysql-test/r/sql_select_limit_func.result' => 'mysql-test/suite/sys_vars/r/sql_select_limit_func.result'
=== renamed file 'mysql-test/r/sql_slave_skip_counter_basic.result' => 'mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result'
=== renamed file 'mysql-test/r/sql_warnings_basic.result' => 'mysql-test/suite/sys_vars/r/sql_warnings_basic.result'
=== renamed file 'mysql-test/r/sql_warnings_func.result' => 'mysql-test/suite/sys_vars/r/sql_warnings_func.result'
=== renamed file 'mysql-test/r/ssl_ca_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_ca_basic.result'
=== renamed file 'mysql-test/r/ssl_capath_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_capath_basic.result'
=== renamed file 'mysql-test/r/ssl_cert_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_cert_basic.result'
=== renamed file 'mysql-test/r/ssl_cipher_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_cipher_basic.result'
=== renamed file 'mysql-test/r/ssl_key_basic.result' => 'mysql-test/suite/sys_vars/r/ssl_key_basic.result'
=== renamed file 'mysql-test/r/storage_engine_basic.result' => 'mysql-test/suite/sys_vars/r/storage_engine_basic.result'
=== renamed file 'mysql-test/r/sync_frm_basic.result' => 'mysql-test/suite/sys_vars/r/sync_frm_basic.result'
=== renamed file 'mysql-test/r/system_time_zone_basic.result' => 'mysql-test/suite/sys_vars/r/system_time_zone_basic.result'
=== renamed file 'mysql-test/r/table_definition_cache_basic.result' => 'mysql-test/suite/sys_vars/r/table_definition_cache_basic.result'
=== renamed file 'mysql-test/r/table_lock_wait_timeout_basic.result' => 'mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result'
=== renamed file 'mysql-test/r/table_open_cache_basic.result' => 'mysql-test/suite/sys_vars/r/table_open_cache_basic.result'
=== renamed file 'mysql-test/r/thread_cache_size_func.result' => 'mysql-test/suite/sys_vars/r/thread_cache_size_func.result'
=== renamed file 'mysql-test/r/thread_handling_basic.result' => 'mysql-test/suite/sys_vars/r/thread_handling_basic.result'
=== renamed file 'mysql-test/r/time_zone_basic.result' => 'mysql-test/suite/sys_vars/r/time_zone_basic.result'
=== renamed file 'mysql-test/r/time_zone_func.result' => 'mysql-test/suite/sys_vars/r/time_zone_func.result'
=== renamed file 'mysql-test/r/timed_mutexes_basic.result' => 'mysql-test/suite/sys_vars/r/timed_mutexes_basic.result'
=== modified file 'mysql-test/suite/sys_vars/r/timestamp_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/timestamp_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic_32.result 2008-12-19 15:03:32 +0000
@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to
SET @@timestamp = 9999999999999999999999;
ERROR 42000: Incorrect argument type to variable 'timestamp'
'#----------------------FN_DYNVARS_001_06------------------------#'
-SELECT @@timestamp = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='timestamp';
-@@timestamp = VARIABLE_VALUE
-1
'#---------------------FN_DYNVARS_001_08-------------------------#'
SET @@timestamp = OFF;
ERROR 42000: Incorrect argument type to variable 'timestamp'
=== modified file 'mysql-test/suite/sys_vars/r/timestamp_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/timestamp_basic_64.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/timestamp_basic_64.result 2008-12-19 15:03:32 +0000
@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to
SET @@timestamp = 9999999999999999999999;
ERROR 42000: Incorrect argument type to variable 'timestamp'
'#----------------------FN_DYNVARS_001_06------------------------#'
-SELECT @@timestamp = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='timestamp';
-@@timestamp = VARIABLE_VALUE
-1
'#---------------------FN_DYNVARS_001_08-------------------------#'
SET @@timestamp = OFF;
ERROR 42000: Incorrect argument type to variable 'timestamp'
=== renamed file 'mysql-test/r/timestamp_func.result' => 'mysql-test/suite/sys_vars/r/timestamp_func.result'
=== renamed file 'mysql-test/r/timestamp_sysdate_is_now_func.result' => 'mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result'
=== renamed file 'mysql-test/r/tmpdir_basic.result' => 'mysql-test/suite/sys_vars/r/tmpdir_basic.result'
=== modified file 'mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result 2009-01-22 10:14:16 +0000
@@ -40,6 +40,8 @@ SELECT @@global.transaction_alloc_block_
@@global.transaction_alloc_block_size
59392
SET @@global.transaction_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
SELECT @@global.transaction_alloc_block_size;
@@global.transaction_alloc_block_size
4294966272
@@ -50,6 +52,8 @@ SELECT @@session.transaction_alloc_block
@@session.transaction_alloc_block_size
1024
SET @@session.transaction_alloc_block_size =4294967295;
+Warnings:
+Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
SELECT @@session.transaction_alloc_block_size;
@@session.transaction_alloc_block_size
4294966272
@@ -146,6 +150,8 @@ WHERE VARIABLE_NAME='transaction_alloc_b
'#---------------------FN_DYNVARS_001_08----------------------#'
SET @@transaction_alloc_block_size = 1024;
SET @@global.transaction_alloc_block_size = 4294967295;
+Warnings:
+Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
0
=== renamed file 'mysql-test/r/tx_isolation_basic.result' => 'mysql-test/suite/sys_vars/r/tx_isolation_basic.result'
=== renamed file 'mysql-test/r/tx_isolation_func.result' => 'mysql-test/suite/sys_vars/r/tx_isolation_func.result'
=== renamed file 'mysql-test/r/unique_checks_basic.result' => 'mysql-test/suite/sys_vars/r/unique_checks_basic.result'
=== renamed file 'mysql-test/r/updatable_views_with_limit_basic.result' => 'mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result'
=== renamed file 'mysql-test/r/updatable_views_with_limit_func.result' => 'mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result'
=== renamed file 'mysql-test/r/version_basic.result' => 'mysql-test/suite/sys_vars/r/version_basic.result'
=== renamed file 'mysql-test/r/version_comment_basic.result' => 'mysql-test/suite/sys_vars/r/version_comment_basic.result'
=== renamed file 'mysql-test/r/version_compile_machine_basic.result' => 'mysql-test/suite/sys_vars/r/version_compile_machine_basic.result'
=== renamed file 'mysql-test/r/version_compile_os_basic.result' => 'mysql-test/suite/sys_vars/r/version_compile_os_basic.result'
=== renamed file 'mysql-test/r/wait_timeout_func.result' => 'mysql-test/suite/sys_vars/r/wait_timeout_func.result'
=== renamed file 'mysql-test/r/warning_count_basic.result' => 'mysql-test/suite/sys_vars/r/warning_count_basic.result'
=== renamed file 'mysql-test/t/auto_commit_basic.test' => 'mysql-test/suite/sys_vars/t/auto_commit_basic.test'
=== renamed file 'mysql-test/t/auto_increment_increment_basic.test' => 'mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test'
=== renamed file 'mysql-test/t/auto_increment_increment_func.test' => 'mysql-test/suite/sys_vars/t/auto_increment_increment_func.test'
=== renamed file 'mysql-test/t/auto_increment_offset_basic.test' => 'mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test'
=== renamed file 'mysql-test/t/auto_increment_offset_func.test' => 'mysql-test/suite/sys_vars/t/auto_increment_offset_func.test'
=== renamed file 'mysql-test/t/autocommit_func-master.opt' => 'mysql-test/suite/sys_vars/t/autocommit_func-master.opt'
=== renamed file 'mysql-test/t/autocommit_func.test' => 'mysql-test/suite/sys_vars/t/autocommit_func.test'
=== renamed file 'mysql-test/t/automatic_sp_privileges_basic.test' => 'mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test'
=== renamed file 'mysql-test/t/automatic_sp_privileges_func.test' => 'mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test'
=== renamed file 'mysql-test/t/basedir_basic.test' => 'mysql-test/suite/sys_vars/t/basedir_basic.test'
=== renamed file 'mysql-test/t/big_tables_basic.test' => 'mysql-test/suite/sys_vars/t/big_tables_basic.test'
=== renamed file 'mysql-test/t/binlog_format_basic.test' => 'mysql-test/suite/sys_vars/t/binlog_format_basic.test'
=== renamed file 'mysql-test/t/character_set_client_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_client_basic.test'
--- a/mysql-test/t/character_set_client_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_client_basic.test 2008-12-19 15:12:15 +0000
@@ -207,7 +207,7 @@ SELECT @@character_set_client;
let charset_variable = @@global.character_set_client;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_010_08-------------------------#'
################################################################################
=== renamed file 'mysql-test/t/character_set_client_func.test' => 'mysql-test/suite/sys_vars/t/character_set_client_func.test'
=== renamed file 'mysql-test/t/character_set_connection_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_connection_basic.test'
--- a/mysql-test/t/character_set_connection_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_connection_basic.test 2008-12-19 15:12:15 +0000
@@ -122,7 +122,7 @@ SET @@character_set_connection = utf8 +
##############################################################################
let charset_variable = @@session.character_set_connection;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_011_07-------------------------#'
@@ -131,7 +131,7 @@ let charset_variable = @@session.charact
##############################################################################
let charset_variable = @@global.character_set_connection;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_011_08-------------------------#'
=== renamed file 'mysql-test/t/character_set_connection_func.test' => 'mysql-test/suite/sys_vars/t/character_set_connection_func.test'
=== renamed file 'mysql-test/t/character_set_database_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_database_basic.test'
--- a/mysql-test/t/character_set_database_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_database_basic.test 2008-12-19 15:12:15 +0000
@@ -121,7 +121,7 @@ SET @@character_set_database = utf8 + la
#############################################################################
let charset_variable = @@session.character_set_database;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_012_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.charact
##############################################################################
let charset_variable = @@global.character_set_database;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_012_08-------------------------#'
=== renamed file 'mysql-test/t/character_set_database_func.test' => 'mysql-test/suite/sys_vars/t/character_set_database_func.test'
=== renamed file 'mysql-test/t/character_set_filesystem_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test'
--- a/mysql-test/t/character_set_filesystem_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test 2008-12-19 15:12:15 +0000
@@ -121,7 +121,7 @@ SET @@character_set_filesystem = utf8 +
###############################################################################
let charset_variable = @@session.character_set_filesystem;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_008_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.charact
##############################################################################
let charset_variable = @@global.character_set_filesystem;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_008_08-------------------------#'
=== renamed file 'mysql-test/t/character_set_filesystem_func-master.opt' => 'mysql-test/suite/sys_vars/t/character_set_filesystem_func-master.opt'
=== renamed file 'mysql-test/t/character_set_results_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_results_basic.test'
--- a/mysql-test/t/character_set_results_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_results_basic.test 2008-12-19 15:12:15 +0000
@@ -121,7 +121,7 @@ SET @@character_set_results = utf8 + lat
##############################################################################
let charset_variable = @@session.character_set_results;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_013_07-------------------------#'
@@ -130,7 +130,7 @@ let charset_variable = @@session.charact
###############################################################################
let charset_variable = @@global.character_set_results;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_013_08-------------------------#'
=== renamed file 'mysql-test/t/character_set_results_func.test' => 'mysql-test/suite/sys_vars/t/character_set_results_func.test'
=== renamed file 'mysql-test/t/character_set_server_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_server_basic.test'
--- a/mysql-test/t/character_set_server_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/character_set_server_basic.test 2008-12-19 15:12:15 +0000
@@ -123,7 +123,7 @@ SET @@character_set_server = utf8 + lati
let charset_variable = @@session.character_set_server;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_009_07-------------------------#'
@@ -132,7 +132,7 @@ let charset_variable = @@session.charact
###############################################################################
let charset_variable = @@global.character_set_server;
---source include/charset_basic.inc
+--source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_009_08-------------------------#'
=== renamed file 'mysql-test/t/character_set_server_func.test' => 'mysql-test/suite/sys_vars/t/character_set_server_func.test'
=== renamed file 'mysql-test/t/character_set_system_basic.test' => 'mysql-test/suite/sys_vars/t/character_set_system_basic.test'
=== renamed file 'mysql-test/t/collation_connection_basic.test' => 'mysql-test/suite/sys_vars/t/collation_connection_basic.test'
--- a/mysql-test/t/collation_connection_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/collation_connection_basic.test 2008-12-19 15:12:15 +0000
@@ -122,7 +122,7 @@ SET @@collation_connection = latin7_gene
###############################################################################
let collation_variable = @@session.collation_connection;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_015_07-------------------------#'
@@ -131,7 +131,7 @@ let collation_variable = @@session.colla
###############################################################################
let collation_variable = @@global.collation_connection;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_015_08-------------------------#'
=== renamed file 'mysql-test/t/collation_connection_func.test' => 'mysql-test/suite/sys_vars/t/collation_connection_func.test'
=== renamed file 'mysql-test/t/collation_database_basic.test' => 'mysql-test/suite/sys_vars/t/collation_database_basic.test'
--- a/mysql-test/t/collation_database_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/collation_database_basic.test 2008-12-19 15:12:15 +0000
@@ -121,7 +121,7 @@ SET @@collation_database = latin7_genera
###########################################################################
let collation_variable = @@session.collation_database;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_016_07-------------------------#'
@@ -130,7 +130,7 @@ let collation_variable = @@session.colla
###############################################################################
let collation_variable = @@global.collation_database;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_016_08-------------------------#'
=== renamed file 'mysql-test/t/collation_database_func.test' => 'mysql-test/suite/sys_vars/t/collation_database_func.test'
=== renamed file 'mysql-test/t/collation_server_basic.test' => 'mysql-test/suite/sys_vars/t/collation_server_basic.test'
--- a/mysql-test/t/collation_server_basic.test 2008-04-16 14:32:33 +0000
+++ b/mysql-test/suite/sys_vars/t/collation_server_basic.test 2008-12-19 15:12:15 +0000
@@ -121,7 +121,7 @@ SET @@collation_server = latin7_general_
##############################################################################
let collation_variable = @@session.collation_server;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_014_07-------------------------#'
@@ -130,7 +130,7 @@ let collation_variable = @@session.colla
#############################################################################
let collation_variable = @@global.collation_server;
---source include/collation_basic.inc
+--source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_014_08-------------------------#'
=== renamed file 'mysql-test/t/collation_server_func.test' => 'mysql-test/suite/sys_vars/t/collation_server_func.test'
=== renamed file 'mysql-test/t/completion_type_basic.test' => 'mysql-test/suite/sys_vars/t/completion_type_basic.test'
=== renamed file 'mysql-test/t/completion_type_func-master.opt' => 'mysql-test/suite/sys_vars/t/completion_type_func-master.opt'
=== renamed file 'mysql-test/t/completion_type_func.test' => 'mysql-test/suite/sys_vars/t/completion_type_func.test'
=== renamed file 'mysql-test/t/concurrent_insert_basic.test' => 'mysql-test/suite/sys_vars/t/concurrent_insert_basic.test'
=== renamed file 'mysql-test/t/concurrent_insert_func.test' => 'mysql-test/suite/sys_vars/t/concurrent_insert_func.test'
=== renamed file 'mysql-test/t/connect_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/connect_timeout_basic.test'
=== renamed file 'mysql-test/t/datadir_basic.test' => 'mysql-test/suite/sys_vars/t/datadir_basic.test'
=== renamed file 'mysql-test/t/default_week_format_basic.test' => 'mysql-test/suite/sys_vars/t/default_week_format_basic.test'
=== renamed file 'mysql-test/t/default_week_format_func.test' => 'mysql-test/suite/sys_vars/t/default_week_format_func.test'
=== renamed file 'mysql-test/t/delay_key_write_basic.test' => 'mysql-test/suite/sys_vars/t/delay_key_write_basic.test'
=== renamed file 'mysql-test/t/delay_key_write_func-master.opt' => 'mysql-test/suite/sys_vars/t/delay_key_write_func-master.opt'
=== renamed file 'mysql-test/t/delay_key_write_func.test' => 'mysql-test/suite/sys_vars/t/delay_key_write_func.test'
=== renamed file 'mysql-test/t/delayed_insert_limit_func.test' => 'mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test'
=== renamed file 'mysql-test/t/delayed_insert_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test'
=== renamed file 'mysql-test/t/div_precision_increment_basic.test' => 'mysql-test/suite/sys_vars/t/div_precision_increment_basic.test'
=== renamed file 'mysql-test/t/div_precision_increment_func.test' => 'mysql-test/suite/sys_vars/t/div_precision_increment_func.test'
=== renamed file 'mysql-test/t/engine_condition_pushdown_basic.test' => 'mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test'
=== renamed file 'mysql-test/t/error_count_basic.test' => 'mysql-test/suite/sys_vars/t/error_count_basic.test'
=== renamed file 'mysql-test/t/event_scheduler_basic.test' => 'mysql-test/suite/sys_vars/t/event_scheduler_basic.test'
=== renamed file 'mysql-test/t/event_scheduler_func.test' => 'mysql-test/suite/sys_vars/t/event_scheduler_func.test'
=== renamed file 'mysql-test/t/expire_logs_days_basic.test' => 'mysql-test/suite/sys_vars/t/expire_logs_days_basic.test'
=== renamed file 'mysql-test/t/flush_basic.test' => 'mysql-test/suite/sys_vars/t/flush_basic.test'
=== renamed file 'mysql-test/t/foreign_key_checks_basic.test' => 'mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test'
=== renamed file 'mysql-test/t/foreign_key_checks_func.test' => 'mysql-test/suite/sys_vars/t/foreign_key_checks_func.test'
=== renamed file 'mysql-test/t/ft_boolean_syntax_basic.test' => 'mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test'
=== renamed file 'mysql-test/t/ft_boolean_syntax_func.test' => 'mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test'
=== renamed file 'mysql-test/t/general_log_basic.test' => 'mysql-test/suite/sys_vars/t/general_log_basic.test'
=== renamed file 'mysql-test/t/general_log_file_basic-master.opt' => 'mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt'
=== renamed file 'mysql-test/t/general_log_file_basic.test' => 'mysql-test/suite/sys_vars/t/general_log_file_basic.test'
=== renamed file 'mysql-test/t/general_log_file_func-master.opt' => 'mysql-test/suite/sys_vars/t/general_log_file_func-master.opt'
=== renamed file 'mysql-test/t/general_log_file_func.test' => 'mysql-test/suite/sys_vars/t/general_log_file_func.test'
=== renamed file 'mysql-test/t/general_log_func.test' => 'mysql-test/suite/sys_vars/t/general_log_func.test'
=== renamed file 'mysql-test/t/group_concat_max_len_basic.test' => 'mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test'
=== renamed file 'mysql-test/t/group_concat_max_len_func.test' => 'mysql-test/suite/sys_vars/t/group_concat_max_len_func.test'
=== renamed file 'mysql-test/t/have_compress_basic.test' => 'mysql-test/suite/sys_vars/t/have_compress_basic.test'
=== renamed file 'mysql-test/t/have_crypt_basic.test' => 'mysql-test/suite/sys_vars/t/have_crypt_basic.test'
=== renamed file 'mysql-test/t/have_csv_basic.test' => 'mysql-test/suite/sys_vars/t/have_csv_basic.test'
=== renamed file 'mysql-test/t/have_dynamic_loading_basic.test' => 'mysql-test/suite/sys_vars/t/have_dynamic_loading_basic.test'
=== renamed file 'mysql-test/t/have_geometry_basic.test' => 'mysql-test/suite/sys_vars/t/have_geometry_basic.test'
=== renamed file 'mysql-test/t/have_innodb_basic.test' => 'mysql-test/suite/sys_vars/t/have_innodb_basic.test'
=== renamed file 'mysql-test/t/have_ndbcluster_basic.test' => 'mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test'
=== renamed file 'mysql-test/t/have_openssl_basic.test' => 'mysql-test/suite/sys_vars/t/have_openssl_basic.test'
=== renamed file 'mysql-test/t/have_partitioning_basic.test' => 'mysql-test/suite/sys_vars/t/have_partitioning_basic.test'
=== renamed file 'mysql-test/t/have_query_cache_basic.test' => 'mysql-test/suite/sys_vars/t/have_query_cache_basic.test'
=== renamed file 'mysql-test/t/have_rtree_keys_basic.test' => 'mysql-test/suite/sys_vars/t/have_rtree_keys_basic.test'
=== renamed file 'mysql-test/t/have_ssl_basic.test' => 'mysql-test/suite/sys_vars/t/have_ssl_basic.test'
=== renamed file 'mysql-test/t/have_symlink_basic.test' => 'mysql-test/suite/sys_vars/t/have_symlink_basic.test'
=== renamed file 'mysql-test/t/hostname_basic.test' => 'mysql-test/suite/sys_vars/t/hostname_basic.test'
=== renamed file 'mysql-test/t/identity_basic.test' => 'mysql-test/suite/sys_vars/t/identity_basic.test'
=== renamed file 'mysql-test/t/identity_func-master.opt' => 'mysql-test/suite/sys_vars/t/identity_func-master.opt'
=== renamed file 'mysql-test/t/identity_func.test' => 'mysql-test/suite/sys_vars/t/identity_func.test'
=== renamed file 'mysql-test/t/init_connect_basic.test' => 'mysql-test/suite/sys_vars/t/init_connect_basic.test'
=== renamed file 'mysql-test/t/init_slave_basic.test' => 'mysql-test/suite/sys_vars/t/init_slave_basic.test'
=== renamed file 'mysql-test/t/innodb_additional_mem_pool_size_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_additional_mem_pool_size_basic.test'
=== renamed file 'mysql-test/t/innodb_autoextend_increment_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test'
=== renamed file 'mysql-test/t/innodb_autoinc_lock_mode_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test'
=== renamed file 'mysql-test/t/innodb_autoinc_lock_mode_func-master.opt' => 'mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt'
=== renamed file 'mysql-test/t/innodb_autoinc_lock_mode_func.test' => 'mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test'
=== renamed file 'mysql-test/t/innodb_buffer_pool_size_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test'
=== renamed file 'mysql-test/t/innodb_checksums_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_checksums_basic.test'
=== renamed file 'mysql-test/t/innodb_commit_concurrency_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test'
=== renamed file 'mysql-test/t/innodb_data_file_path_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test'
=== renamed file 'mysql-test/t/innodb_data_home_dir_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test'
=== renamed file 'mysql-test/t/innodb_doublewrite_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test'
=== renamed file 'mysql-test/t/innodb_fast_shutdown_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test'
=== renamed file 'mysql-test/t/innodb_file_io_threads_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test'
=== renamed file 'mysql-test/t/innodb_file_per_table_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test'
=== renamed file 'mysql-test/t/innodb_flush_log_at_trx_commit_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test'
=== renamed file 'mysql-test/t/innodb_flush_method_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_flush_method_basic.test'
=== renamed file 'mysql-test/t/innodb_force_recovery_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_force_recovery_basic.test'
=== renamed file 'mysql-test/t/innodb_lock_wait_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test'
=== renamed file 'mysql-test/t/innodb_locks_unsafe_for_binlog_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test'
=== renamed file 'mysql-test/t/innodb_log_buffer_size_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_log_buffer_size_basic.test'
=== renamed file 'mysql-test/t/innodb_log_file_size_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_log_file_size_basic.test'
=== renamed file 'mysql-test/t/innodb_log_files_in_group_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_log_files_in_group_basic.test'
=== renamed file 'mysql-test/t/innodb_log_group_home_dir_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test'
=== renamed file 'mysql-test/t/innodb_max_dirty_pages_pct_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test'
=== renamed file 'mysql-test/t/innodb_max_dirty_pages_pct_func.test' => 'mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_func.test'
=== renamed file 'mysql-test/t/innodb_mirrored_log_groups_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_mirrored_log_groups_basic.test'
=== renamed file 'mysql-test/t/innodb_open_files_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_open_files_basic.test'
=== renamed file 'mysql-test/t/innodb_rollback_on_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test'
=== renamed file 'mysql-test/t/innodb_support_xa_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test'
=== renamed file 'mysql-test/t/innodb_support_xa_func.test' => 'mysql-test/suite/sys_vars/t/innodb_support_xa_func.test'
=== renamed file 'mysql-test/t/innodb_table_locks_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test'
=== renamed file 'mysql-test/t/innodb_table_locks_func.test' => 'mysql-test/suite/sys_vars/t/innodb_table_locks_func.test'
=== renamed file 'mysql-test/t/innodb_thread_concurrency_basic.test' => 'mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test'
=== renamed file 'mysql-test/t/insert_id_basic.test' => 'mysql-test/suite/sys_vars/t/insert_id_basic.test'
=== renamed file 'mysql-test/t/insert_id_func.test' => 'mysql-test/suite/sys_vars/t/insert_id_func.test'
=== renamed file 'mysql-test/t/interactive_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/interactive_timeout_basic.test'
=== renamed file 'mysql-test/t/interactive_timeout_func.test' => 'mysql-test/suite/sys_vars/t/interactive_timeout_func.test'
=== renamed file 'mysql-test/t/keep_files_on_create_basic.test' => 'mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test'
=== renamed file 'mysql-test/t/key_buffer_size_func.test' => 'mysql-test/suite/sys_vars/t/key_buffer_size_func.test'
=== renamed file 'mysql-test/t/last_insert_id_func-master.opt' => 'mysql-test/suite/sys_vars/t/last_insert_id_func-master.opt'
=== renamed file 'mysql-test/t/last_insert_id_func.test' => 'mysql-test/suite/sys_vars/t/last_insert_id_func.test'
=== renamed file 'mysql-test/t/lc_time_names_basic.test' => 'mysql-test/suite/sys_vars/t/lc_time_names_basic.test'
=== renamed file 'mysql-test/t/lc_time_names_func.test' => 'mysql-test/suite/sys_vars/t/lc_time_names_func.test'
=== renamed file 'mysql-test/t/license_basic.test' => 'mysql-test/suite/sys_vars/t/license_basic.test'
=== renamed file 'mysql-test/t/local_infile_basic.test' => 'mysql-test/suite/sys_vars/t/local_infile_basic.test'
=== renamed file 'mysql-test/t/local_infile_func.test' => 'mysql-test/suite/sys_vars/t/local_infile_func.test'
=== renamed file 'mysql-test/t/log_basic.test' => 'mysql-test/suite/sys_vars/t/log_basic.test'
=== renamed file 'mysql-test/t/log_bin_trust_function_creators_basic.test' => 'mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test'
=== renamed file 'mysql-test/t/log_bin_trust_function_creators_func.test' => 'mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_func.test'
=== renamed file 'mysql-test/t/log_bin_trust_routine_creators_basic.test' => 'mysql-test/suite/sys_vars/t/log_bin_trust_routine_creators_basic.test'
=== renamed file 'mysql-test/t/log_output_basic.test' => 'mysql-test/suite/sys_vars/t/log_output_basic.test'
=== renamed file 'mysql-test/t/log_output_func.test' => 'mysql-test/suite/sys_vars/t/log_output_func.test'
=== renamed file 'mysql-test/t/log_queries_not_using_indexes_basic.test' => 'mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test'
=== renamed file 'mysql-test/t/long_query_time_basic.test' => 'mysql-test/suite/sys_vars/t/long_query_time_basic.test'
=== renamed file 'mysql-test/t/low_priority_updates_basic.test' => 'mysql-test/suite/sys_vars/t/low_priority_updates_basic.test'
=== renamed file 'mysql-test/t/max_allowed_packet_basic.test' => 'mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test'
=== renamed file 'mysql-test/t/max_allowed_packet_func.test' => 'mysql-test/suite/sys_vars/t/max_allowed_packet_func.test'
=== renamed file 'mysql-test/t/max_binlog_cache_size_func-master.opt' => 'mysql-test/suite/sys_vars/t/max_binlog_cache_size_func-master.opt'
=== renamed file 'mysql-test/t/max_binlog_size_basic.test' => 'mysql-test/suite/sys_vars/t/max_binlog_size_basic.test'
=== renamed file 'mysql-test/t/max_connections_basic.test' => 'mysql-test/suite/sys_vars/t/max_connections_basic.test'
=== renamed file 'mysql-test/t/max_delayed_threads_basic.test' => 'mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test'
=== renamed file 'mysql-test/t/max_error_count_basic.test' => 'mysql-test/suite/sys_vars/t/max_error_count_basic.test'
=== renamed file 'mysql-test/t/max_insert_delayed_threads_basic.test' => 'mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test'
=== renamed file 'mysql-test/t/max_join_size_func.test' => 'mysql-test/suite/sys_vars/t/max_join_size_func.test'
=== renamed file 'mysql-test/t/max_length_for_sort_data_basic.test' => 'mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test'
=== renamed file 'mysql-test/t/max_prepared_stmt_count_basic.test' => 'mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test'
=== renamed file 'mysql-test/t/max_prepared_stmt_count_func.test' => 'mysql-test/suite/sys_vars/t/max_prepared_stmt_count_func.test'
=== renamed file 'mysql-test/t/max_relay_log_size_basic.test' => 'mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test'
=== renamed file 'mysql-test/t/max_seeks_for_key_func.test' => 'mysql-test/suite/sys_vars/t/max_seeks_for_key_func.test'
=== renamed file 'mysql-test/t/max_sort_length_basic.test' => 'mysql-test/suite/sys_vars/t/max_sort_length_basic.test'
=== renamed file 'mysql-test/t/max_sort_length_func.test' => 'mysql-test/suite/sys_vars/t/max_sort_length_func.test'
=== renamed file 'mysql-test/t/max_sp_recursion_depth_basic.test' => 'mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test'
=== renamed file 'mysql-test/t/max_sp_recursion_depth_func.test' => 'mysql-test/suite/sys_vars/t/max_sp_recursion_depth_func.test'
=== renamed file 'mysql-test/t/max_user_connections_basic.test' => 'mysql-test/suite/sys_vars/t/max_user_connections_basic.test'
=== renamed file 'mysql-test/t/max_user_connections_func.test' => 'mysql-test/suite/sys_vars/t/max_user_connections_func.test'
=== renamed file 'mysql-test/t/myisam_data_pointer_size_basic.test' => 'mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test'
=== renamed file 'mysql-test/t/myisam_data_pointer_size_func.test' => 'mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test'
=== renamed file 'mysql-test/t/myisam_stats_method_basic.test' => 'mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test'
=== renamed file 'mysql-test/t/myisam_stats_method_func.test' => 'mysql-test/suite/sys_vars/t/myisam_stats_method_func.test'
=== renamed file 'mysql-test/t/myisam_use_mmap_basic.test' => 'mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test'
=== renamed file 'mysql-test/t/ndb_log_update_as_write_basic.test' => 'mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test'
=== renamed file 'mysql-test/t/ndb_log_updated_only_basic.test' => 'mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test'
=== renamed file 'mysql-test/t/net_buffer_length_basic.test' => 'mysql-test/suite/sys_vars/t/net_buffer_length_basic.test'
=== renamed file 'mysql-test/t/net_read_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/net_read_timeout_basic.test'
=== renamed file 'mysql-test/t/net_write_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/net_write_timeout_basic.test'
=== renamed file 'mysql-test/t/new_basic.test' => 'mysql-test/suite/sys_vars/t/new_basic.test'
=== renamed file 'mysql-test/t/old_passwords_basic.test' => 'mysql-test/suite/sys_vars/t/old_passwords_basic.test'
=== renamed file 'mysql-test/t/old_passwords_func.test' => 'mysql-test/suite/sys_vars/t/old_passwords_func.test'
=== renamed file 'mysql-test/t/optimizer_prune_level_basic.test' => 'mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test'
=== renamed file 'mysql-test/t/optimizer_search_depth_basic.test' => 'mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test'
=== renamed file 'mysql-test/t/preload_buffer_size_basic.test' => 'mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test'
=== renamed file 'mysql-test/t/query_cache_limit_func.test' => 'mysql-test/suite/sys_vars/t/query_cache_limit_func.test'
=== renamed file 'mysql-test/t/query_cache_type_basic.test' => 'mysql-test/suite/sys_vars/t/query_cache_type_basic.test'
=== renamed file 'mysql-test/t/query_cache_type_func.test' => 'mysql-test/suite/sys_vars/t/query_cache_type_func.test'
=== renamed file 'mysql-test/t/query_cache_wlock_invalidate_basic.test' => 'mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test'
=== renamed file 'mysql-test/t/query_cache_wlock_invalidate_func.test' => 'mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test'
=== renamed file 'mysql-test/t/query_prealloc_size_func.test' => 'mysql-test/suite/sys_vars/t/query_prealloc_size_func.test'
=== renamed file 'mysql-test/t/read_buffer_size_basic.test' => 'mysql-test/suite/sys_vars/t/read_buffer_size_basic.test'
=== renamed file 'mysql-test/t/read_only_basic.test' => 'mysql-test/suite/sys_vars/t/read_only_basic.test'
=== renamed file 'mysql-test/t/read_only_func.test' => 'mysql-test/suite/sys_vars/t/read_only_func.test'
=== renamed file 'mysql-test/t/read_rnd_buffer_size_basic.test' => 'mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test'
=== renamed file 'mysql-test/t/relay_log_purge_basic.test' => 'mysql-test/suite/sys_vars/t/relay_log_purge_basic.test'
=== renamed file 'mysql-test/t/rpl_init_slave_func.test' => 'mysql-test/suite/sys_vars/t/rpl_init_slave_func.test'
=== renamed file 'mysql-test/t/rpl_max_binlog_size_func-master.opt' => 'mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt'
=== renamed file 'mysql-test/t/rpl_max_binlog_size_func.test' => 'mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test'
--- a/mysql-test/t/rpl_max_binlog_size_func.test 2008-04-14 15:21:18 +0000
+++ b/mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test 2008-12-19 15:12:15 +0000
@@ -32,6 +32,7 @@ dec $a;
--echo 'mylog.000002 exists'
+DROP TABLE t1;
###############################################################################
# End of functionality testing for max_binlog_size #
###############################################################################
=== renamed file 'mysql-test/t/secure_auth_basic.test' => 'mysql-test/suite/sys_vars/t/secure_auth_basic.test'
=== renamed file 'mysql-test/t/secure_auth_func-master.opt' => 'mysql-test/suite/sys_vars/t/secure_auth_func-master.opt'
=== renamed file 'mysql-test/t/secure_auth_func.test' => 'mysql-test/suite/sys_vars/t/secure_auth_func.test'
=== renamed file 'mysql-test/t/slave_allow_batching_basic.test' => 'mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test'
=== renamed file 'mysql-test/t/slave_compressed_protocol_basic.test' => 'mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test'
=== renamed file 'mysql-test/t/slave_exec_mode_basic.test' => 'mysql-test/suite/sys_vars/t/slave_exec_mode_basic.test'
=== renamed file 'mysql-test/t/slave_net_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test'
=== renamed file 'mysql-test/t/slow_launch_time_basic.test' => 'mysql-test/suite/sys_vars/t/slow_launch_time_basic.test'
=== renamed file 'mysql-test/t/slow_launch_time_func.test' => 'mysql-test/suite/sys_vars/t/slow_launch_time_func.test'
=== renamed file 'mysql-test/t/slow_query_log_basic.test' => 'mysql-test/suite/sys_vars/t/slow_query_log_basic.test'
=== renamed file 'mysql-test/t/slow_query_log_file_basic-master.opt' => 'mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt'
=== renamed file 'mysql-test/t/slow_query_log_file_basic.test' => 'mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test'
=== renamed file 'mysql-test/t/slow_query_log_file_func-master.opt' => 'mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt'
=== renamed file 'mysql-test/t/slow_query_log_file_func.test' => 'mysql-test/suite/sys_vars/t/slow_query_log_file_func.test'
=== renamed file 'mysql-test/t/slow_query_log_func.test' => 'mysql-test/suite/sys_vars/t/slow_query_log_func.test'
=== renamed file 'mysql-test/t/sql_auto_is_null_basic.test' => 'mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test'
=== renamed file 'mysql-test/t/sql_big_selects_basic.test' => 'mysql-test/suite/sys_vars/t/sql_big_selects_basic.test'
=== renamed file 'mysql-test/t/sql_big_selects_func.test' => 'mysql-test/suite/sys_vars/t/sql_big_selects_func.test'
=== renamed file 'mysql-test/t/sql_big_tables_basic.test' => 'mysql-test/suite/sys_vars/t/sql_big_tables_basic.test'
=== renamed file 'mysql-test/t/sql_big_tables_func.test' => 'mysql-test/suite/sys_vars/t/sql_big_tables_func.test'
=== renamed file 'mysql-test/t/sql_buffer_result_basic.test' => 'mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test'
=== renamed file 'mysql-test/t/sql_buffer_result_func.test' => 'mysql-test/suite/sys_vars/t/sql_buffer_result_func.test'
=== renamed file 'mysql-test/t/sql_log_bin_basic.test' => 'mysql-test/suite/sys_vars/t/sql_log_bin_basic.test'
=== renamed file 'mysql-test/t/sql_log_off_basic.test' => 'mysql-test/suite/sys_vars/t/sql_log_off_basic.test'
=== renamed file 'mysql-test/t/sql_log_off_func.test' => 'mysql-test/suite/sys_vars/t/sql_log_off_func.test'
=== renamed file 'mysql-test/t/sql_low_priority_updates_basic.test' => 'mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test'
=== renamed file 'mysql-test/t/sql_low_priority_updates_func.test' => 'mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test'
=== renamed file 'mysql-test/t/sql_max_join_size_func.test' => 'mysql-test/suite/sys_vars/t/sql_max_join_size_func.test'
=== renamed file 'mysql-test/t/sql_mode_basic.test' => 'mysql-test/suite/sys_vars/t/sql_mode_basic.test'
=== renamed file 'mysql-test/t/sql_mode_func.test' => 'mysql-test/suite/sys_vars/t/sql_mode_func.test'
=== renamed file 'mysql-test/t/sql_notes_basic.test' => 'mysql-test/suite/sys_vars/t/sql_notes_basic.test'
=== renamed file 'mysql-test/t/sql_notes_func.test' => 'mysql-test/suite/sys_vars/t/sql_notes_func.test'
=== renamed file 'mysql-test/t/sql_quote_show_create_basic.test' => 'mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test'
=== renamed file 'mysql-test/t/sql_quote_show_create_func.test' => 'mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test'
=== renamed file 'mysql-test/t/sql_safe_updates_basic.test' => 'mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test'
=== renamed file 'mysql-test/t/sql_safe_updates_func.test' => 'mysql-test/suite/sys_vars/t/sql_safe_updates_func.test'
=== renamed file 'mysql-test/t/sql_select_limit_func.test' => 'mysql-test/suite/sys_vars/t/sql_select_limit_func.test'
=== renamed file 'mysql-test/t/sql_slave_skip_counter_basic.test' => 'mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test'
=== renamed file 'mysql-test/t/sql_warnings_basic.test' => 'mysql-test/suite/sys_vars/t/sql_warnings_basic.test'
=== renamed file 'mysql-test/t/sql_warnings_func.test' => 'mysql-test/suite/sys_vars/t/sql_warnings_func.test'
=== renamed file 'mysql-test/t/ssl_ca_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_ca_basic.test'
=== renamed file 'mysql-test/t/ssl_capath_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_capath_basic.test'
=== renamed file 'mysql-test/t/ssl_cert_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_cert_basic.test'
=== renamed file 'mysql-test/t/ssl_cipher_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_cipher_basic.test'
=== renamed file 'mysql-test/t/ssl_key_basic.test' => 'mysql-test/suite/sys_vars/t/ssl_key_basic.test'
=== renamed file 'mysql-test/t/storage_engine_basic-master.opt' => 'mysql-test/suite/sys_vars/t/storage_engine_basic-master.opt'
=== renamed file 'mysql-test/t/storage_engine_basic.test' => 'mysql-test/suite/sys_vars/t/storage_engine_basic.test'
=== renamed file 'mysql-test/t/sync_frm_basic.test' => 'mysql-test/suite/sys_vars/t/sync_frm_basic.test'
=== renamed file 'mysql-test/t/system_time_zone_basic.test' => 'mysql-test/suite/sys_vars/t/system_time_zone_basic.test'
=== renamed file 'mysql-test/t/table_definition_cache_basic.test' => 'mysql-test/suite/sys_vars/t/table_definition_cache_basic.test'
=== renamed file 'mysql-test/t/table_lock_wait_timeout_basic.test' => 'mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test'
=== renamed file 'mysql-test/t/table_open_cache_basic.test' => 'mysql-test/suite/sys_vars/t/table_open_cache_basic.test'
=== renamed file 'mysql-test/t/thread_cache_size_func.test' => 'mysql-test/suite/sys_vars/t/thread_cache_size_func.test'
=== renamed file 'mysql-test/t/thread_handling_basic.test' => 'mysql-test/suite/sys_vars/t/thread_handling_basic.test'
=== renamed file 'mysql-test/t/time_zone_basic.test' => 'mysql-test/suite/sys_vars/t/time_zone_basic.test'
=== renamed file 'mysql-test/t/time_zone_func.test' => 'mysql-test/suite/sys_vars/t/time_zone_func.test'
=== renamed file 'mysql-test/t/timed_mutexes_basic.test' => 'mysql-test/suite/sys_vars/t/timed_mutexes_basic.test'
=== renamed file 'mysql-test/t/timestamp_func.test' => 'mysql-test/suite/sys_vars/t/timestamp_func.test'
=== renamed file 'mysql-test/t/timestamp_sysdate_is_now_func-master.opt' => 'mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func-master.opt'
=== renamed file 'mysql-test/t/timestamp_sysdate_is_now_func.test' => 'mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test'
=== renamed file 'mysql-test/t/tmpdir_basic.test' => 'mysql-test/suite/sys_vars/t/tmpdir_basic.test'
=== renamed file 'mysql-test/t/tx_isolation_basic.test' => 'mysql-test/suite/sys_vars/t/tx_isolation_basic.test'
=== renamed file 'mysql-test/t/tx_isolation_func-master.opt' => 'mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt'
=== renamed file 'mysql-test/t/tx_isolation_func.test' => 'mysql-test/suite/sys_vars/t/tx_isolation_func.test'
=== renamed file 'mysql-test/t/unique_checks_basic.test' => 'mysql-test/suite/sys_vars/t/unique_checks_basic.test'
=== renamed file 'mysql-test/t/updatable_views_with_limit_basic.test' => 'mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test'
=== renamed file 'mysql-test/t/updatable_views_with_limit_func.test' => 'mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test'
=== renamed file 'mysql-test/t/version_basic.test' => 'mysql-test/suite/sys_vars/t/version_basic.test'
=== renamed file 'mysql-test/t/version_comment_basic.test' => 'mysql-test/suite/sys_vars/t/version_comment_basic.test'
=== renamed file 'mysql-test/t/version_compile_machine_basic.test' => 'mysql-test/suite/sys_vars/t/version_compile_machine_basic.test'
=== renamed file 'mysql-test/t/version_compile_os_basic.test' => 'mysql-test/suite/sys_vars/t/version_compile_os_basic.test'
=== renamed file 'mysql-test/t/wait_timeout_func.test' => 'mysql-test/suite/sys_vars/t/wait_timeout_func.test'
=== renamed file 'mysql-test/t/warning_count_basic.test' => 'mysql-test/suite/sys_vars/t/warning_count_basic.test'
| Thread |
|---|
| • bzr push into mysql-5.1 branch (horst:2732) WL#4681 | Horst Hunger | 22 Jan |
