2731 Alexander Nozdrin 2009-02-24
A patch for Bug#34828: OF is taken as OFF and a value of 0
is set for variable SQL_notes.
The problem was that partial match was allowed for keywords.
A fix is to disable partial match and require full match.
modified:
mysql-test/r/variables.result
mysql-test/t/variables.test
sql/set_var.cc
2730 Alexander Nozdrin 2009-02-19 [merge]
Pull from 6.0
removed:
cmd-line-utils/libedit/TEST/
cmd-line-utils/libedit/TEST/test.c
cmd-line-utils/libedit/compat.h
cmd-line-utils/libedit/compat_conf.h
cmd-line-utils/libedit/editline.3
cmd-line-utils/libedit/editrc.5
cmd-line-utils/libedit/fgetln.c
cmd-line-utils/libedit/fgetln.h
cmd-line-utils/libedit/libedit_term.h
cmd-line-utils/libedit/strlcpy.c
cmd-line-utils/libedit/strlcpy.h
cmd-line-utils/libedit/tokenizer.h
cmd-line-utils/libedit/unvis.c
cmd-line-utils/libedit/vis.c
cmd-line-utils/libedit/vis.h
mysql-test/include/wait_for_query_to_suceed.inc
mysql-test/suite/falcon_team/r/falcon_bug_29246.result
mysql-test/suite/falcon_team/t/falcon_bug_29246.test
mysql-test/suite/funcs_1/r/falcon_storedproc.result
mysql-test/suite/funcs_1/t/falcon_storedproc.test
storage/falcon/Blob.cpp
storage/falcon/Page.cpp
storage/falcon/SyncWait.cpp
added:
cmd-line-utils/libedit/README
cmd-line-utils/libedit/filecomplete.c
cmd-line-utils/libedit/filecomplete.h
mysql-test/extra/binlog_tests/binlog_truncate.test
mysql-test/include/count_sessions.inc
mysql-test/include/have_myisam_or_maria_default.inc
mysql-test/include/wait_for_query_to_succeed.inc
mysql-test/include/wait_until_count_sessions.inc
mysql-test/r/innodb_ignore_builtin.result
mysql-test/suite/backup/r/backup_maria.result
mysql-test/suite/backup/r/backup_maria_other_instance.result
mysql-test/suite/backup/t/backup_maria.test
mysql-test/suite/backup/t/backup_maria_other_instance.test
mysql-test/suite/binlog/r/binlog_truncate_innodb.result
mysql-test/suite/binlog/r/binlog_truncate_myisam.result
mysql-test/suite/binlog/t/binlog_truncate_innodb-master.opt
mysql-test/suite/binlog/t/binlog_truncate_innodb.test
mysql-test/suite/binlog/t/binlog_truncate_myisam.test
mysql-test/suite/falcon/r/falcon_bug_26433-big.result
mysql-test/suite/falcon/r/falcon_bug_33148.result
mysql-test/suite/falcon/r/falcon_bug_33720.result
mysql-test/suite/falcon/r/falcon_bug_35257.result
mysql-test/suite/falcon/r/falcon_bug_36186.result
mysql-test/suite/falcon/r/falcon_bug_40607.result
mysql-test/suite/falcon/r/falcon_bug_40801.result
mysql-test/suite/falcon/r/falcon_bug_41548.result
mysql-test/suite/falcon/r/falcon_bug_41582.result
mysql-test/suite/falcon/r/falcon_bug_42196.result
mysql-test/suite/falcon/r/falcon_ps_repeatable_read.result
mysql-test/suite/falcon/t/falcon_bug_26433-big.test
mysql-test/suite/falcon/t/falcon_bug_33148.test
mysql-test/suite/falcon/t/falcon_bug_33720.test
mysql-test/suite/falcon/t/falcon_bug_35257.test
mysql-test/suite/falcon/t/falcon_bug_36186.test
mysql-test/suite/falcon/t/falcon_bug_40607.test
mysql-test/suite/falcon/t/falcon_bug_40801.test
mysql-test/suite/falcon/t/falcon_bug_41548.test
mysql-test/suite/falcon/t/falcon_bug_41582.test
mysql-test/suite/falcon/t/falcon_bug_42196.test
mysql-test/suite/falcon/t/falcon_ps_repeatable_read.test
mysql-test/suite/maria/t/disabled.def
mysql-test/suite/maria/t/maria-preload-master.opt
mysql-test/suite/rpl/r/rpl_drop_if_exists.result
mysql-test/suite/rpl/t/rpl_drop_if_exists.test
mysql-test/t/innodb_ignore_builtin-master.opt
mysql-test/t/innodb_ignore_builtin.test
storage/falcon/SRLInventoryPage.cpp
storage/falcon/SRLInventoryPage.h
storage/maria/ma_examine_non_trans_log.c
storage/maria/ma_non_trans_log.c
storage/maria/maria_backup_engine.cc
storage/maria/maria_non_trans_log.c
renamed:
mysql-test/r/maria_mrr.result => mysql-test/suite/maria/r/maria_mrr.result
mysql-test/suite/falcon/r/falcon_bug_34351_C.result => mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result
mysql-test/suite/falcon/t/falcon_bug_34351_C.test => mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test
mysql-test/suite/falcon_team/r/falcon_bug_26433.result => mysql-test/suite/falcon/r/falcon_bug_26433.result
mysql-test/suite/falcon_team/r/falcon_bug_28048.result => mysql-test/suite/falcon/r/falcon_bug_28048.result
mysql-test/suite/falcon_team/r/falcon_bug_31296.result => mysql-test/suite/falcon/r/falcon_bug_31296.result
mysql-test/suite/falcon_team/r/falcon_bug_36294.result => mysql-test/suite/falcon_team/r/falcon_bug_36294-big.result
mysql-test/suite/falcon_team/t/falcon_bug_26433.test => mysql-test/suite/falcon/t/falcon_bug_26433.test
mysql-test/suite/falcon_team/t/falcon_bug_28048.test => mysql-test/suite/falcon/t/falcon_bug_28048.test
mysql-test/suite/falcon_team/t/falcon_bug_31296.test => mysql-test/suite/falcon/t/falcon_bug_31296.test
mysql-test/suite/falcon_team/t/falcon_bug_36294.test => mysql-test/suite/falcon_team/t/falcon_bug_36294-big.test
mysql-test/t/maria_mrr.test => mysql-test/suite/maria/t/maria_mrr.test
netware/BUILD/nwbootstrap => netware/BUILD/nwbuild
modified:
.bzr-mysql/default.conf
.bzrignore
BUILD/Makefile.am
Docs/Makefile.am
Makefile.am
client/Makefile.am
client/mysql.cc
client/mysqldump.c
client/mysqltest.cc
client/sql_string.cc
cmd-line-utils/Makefile.am
cmd-line-utils/libedit/Makefile.am
cmd-line-utils/libedit/chared.c
cmd-line-utils/libedit/chared.h
cmd-line-utils/libedit/common.c
cmd-line-utils/libedit/config.h
cmd-line-utils/libedit/el.c
cmd-line-utils/libedit/el.h
cmd-line-utils/libedit/el_term.h
cmd-line-utils/libedit/emacs.c
cmd-line-utils/libedit/hist.c
cmd-line-utils/libedit/histedit.h
cmd-line-utils/libedit/history.c
cmd-line-utils/libedit/key.c
cmd-line-utils/libedit/key.h
cmd-line-utils/libedit/makelist.sh
cmd-line-utils/libedit/map.c
cmd-line-utils/libedit/np/fgetln.c
cmd-line-utils/libedit/np/strlcat.c
cmd-line-utils/libedit/np/strlcpy.c
cmd-line-utils/libedit/np/unvis.c
cmd-line-utils/libedit/np/vis.c
cmd-line-utils/libedit/np/vis.h
cmd-line-utils/libedit/parse.c
cmd-line-utils/libedit/parse.h
cmd-line-utils/libedit/prompt.c
cmd-line-utils/libedit/read.c
cmd-line-utils/libedit/read.h
cmd-line-utils/libedit/readline.c
cmd-line-utils/libedit/readline/readline.h
cmd-line-utils/libedit/refresh.c
cmd-line-utils/libedit/search.c
cmd-line-utils/libedit/sig.c
cmd-line-utils/libedit/sig.h
cmd-line-utils/libedit/sys.h
cmd-line-utils/libedit/term.c
cmd-line-utils/libedit/tokenizer.c
cmd-line-utils/libedit/tty.c
cmd-line-utils/libedit/tty.h
cmd-line-utils/libedit/vi.c
cmd-line-utils/readline/Makefile.am
config/ac-macros/alloca.m4
config/ac-macros/check_cpu.m4
config/ac-macros/compiler_flag.m4
config/ac-macros/ha_ndbcluster.m4
config/ac-macros/large_file.m4
config/ac-macros/libevent_configure.m4
config/ac-macros/misc.m4
config/ac-macros/readline.m4
config/ac-macros/ssl.m4
config/ac-macros/zlib.m4
configure.in
dbug/Makefile.am
dbug/dbug.c
dbug/tests-t.pl
dbug/user.r
extra/CMakeLists.txt*
extra/Makefile.am
extra/comp_err.c
extra/libevent/Makefile.am
extra/yassl/Makefile.am
extra/yassl/src/Makefile.am
extra/yassl/taocrypt/Makefile.am
extra/yassl/taocrypt/benchmark/Makefile.am
extra/yassl/taocrypt/src/Makefile.am
extra/yassl/taocrypt/test/Makefile.am
extra/yassl/testsuite/Makefile.am
include/Makefile.am
include/atomic/generic-msvc.h
include/config-win.h
include/lf.h
include/maria.h
include/my_global.h
include/my_pthread.h
include/myisam.h
include/thr_lock.h
include/waiting_threads.h
libmysql/Makefile.am
libmysql_r/Makefile.am
libmysqld/Makefile.am
libmysqld/examples/Makefile.am
man/Makefile.am
mysql-test/Makefile.am
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
mysql-test/extra/rpl_tests/rpl_truncate.test
mysql-test/extra/rpl_tests/rpl_truncate_helper.test
mysql-test/include/ps_modify.inc
mysql-test/include/setup_fake_relay_log.inc
mysql-test/include/wait_until_connected_again.inc
mysql-test/lib/My/CoreDump.pm
mysql-test/lib/My/SafeProcess/safe_process_win.cc
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_report.pm
mysql-test/lib/mtr_unique.pm
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/mysql-test-run.pl
mysql-test/r/auto_increment.result
mysql-test/r/commit_1innodb.result
mysql-test/r/csv_not_null.result
mysql-test/r/ctype_utf8.result
mysql-test/r/ddl_i18n_koi8r.result
mysql-test/r/ddl_i18n_utf8.result
mysql-test/r/delayed.result
mysql-test/r/events_grant.result
mysql-test/r/fulltext.result
mysql-test/r/func_misc.result
mysql-test/r/func_sapdb.result
mysql-test/r/func_str.result
mysql-test/r/grant.result
mysql-test/r/grant2.result
mysql-test/r/grant4.result
mysql-test/r/information_schema.result
mysql-test/r/information_schema_inno.result
mysql-test/r/information_schema_parameters.result
mysql-test/r/information_schema_part.result
mysql-test/r/information_schema_routines.result
mysql-test/r/innodb_mysql.result
mysql-test/r/join.result
mysql-test/r/join_cache.result
mysql-test/r/lock_tables_lost_commit.result
mysql-test/r/lowercase_table.result
mysql-test/r/lowercase_table3.result
mysql-test/r/merge.result
mysql-test/r/multi_update.result
mysql-test/r/myisampack.result
mysql-test/r/mysqlbinlog_row_trans.result
mysql-test/r/mysqlcheck.result
mysql-test/r/mysqldump.result
mysql-test/r/null.result
mysql-test/r/outfile.result
mysql-test/r/packet.result
mysql-test/r/partition_hash.result
mysql-test/r/partition_pruning.result
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/query_cache_notembedded.result
mysql-test/r/read_only.result
mysql-test/r/show_check.result
mysql-test/r/status.result
mysql-test/r/subselect.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_opts.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/r/synchronization.result
mysql-test/r/trigger-compat.result
mysql-test/r/trigger_notembedded.result
mysql-test/r/type_datetime.result
mysql-test/r/type_float.result
mysql-test/r/warnings.result
mysql-test/r/windows.result
mysql-test/r/xml.result
mysql-test/suite/backup/r/backup.result
mysql-test/suite/backup/r/backup_commit_backup.result
mysql-test/suite/backup/r/backup_default.result
mysql-test/suite/backup/r/backup_lock_myisam.result
mysql-test/suite/backup/r/backup_logs.result
mysql-test/suite/backup/r/backup_logs_purge.result
mysql-test/suite/backup/r/backup_multi_blocks.result
mysql-test/suite/backup/r/backup_myisam.result
mysql-test/suite/backup/r/backup_myisam_extlocking.result
mysql-test/suite/backup/r/backup_myisam_sync.result
mysql-test/suite/backup/r/backup_no_be.result
mysql-test/suite/backup/r/backup_objects.result
mysql-test/suite/backup/r/backup_tablespace.result
mysql-test/suite/backup/t/backup.test
mysql-test/suite/backup/t/backup_commit_backup.test
mysql-test/suite/backup/t/backup_ddl_blocker.test
mysql-test/suite/backup/t/backup_default.test
mysql-test/suite/backup/t/backup_lock_myisam.test
mysql-test/suite/backup/t/backup_logs.test
mysql-test/suite/backup/t/backup_logs_purge.test
mysql-test/suite/backup/t/backup_multi_blocks.test
mysql-test/suite/backup/t/backup_myisam.test
mysql-test/suite/backup/t/backup_myisam_extlocking.test
mysql-test/suite/backup/t/backup_myisam_sync.test
mysql-test/suite/backup/t/backup_no_be.test
mysql-test/suite/backup/t/backup_no_data.test
mysql-test/suite/backup/t/backup_no_engine.test
mysql-test/suite/backup/t/backup_objects.test
mysql-test/suite/backup/t/disabled.def
mysql-test/suite/backup_engines/t/disabled.def
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_unsafe.result
mysql-test/suite/binlog/t/binlog_unsafe.test
mysql-test/suite/binlog/t/disabled.def
mysql-test/suite/falcon/r/falcon_bug_29246.result
mysql-test/suite/falcon/r/falcon_bug_32398.result
mysql-test/suite/falcon/r/falcon_bug_32833.result
mysql-test/suite/falcon/r/falcon_online_index.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/r/ps_8falcon.result
mysql-test/suite/falcon/t/disabled.def
mysql-test/suite/falcon/t/falcon_bug.template
mysql-test/suite/falcon/t/falcon_bug_22180.test
mysql-test/suite/falcon/t/falcon_bug_23689.test
mysql-test/suite/falcon/t/falcon_bug_24511.test
mysql-test/suite/falcon/t/falcon_bug_24858.test
mysql-test/suite/falcon/t/falcon_bug_24921.test
mysql-test/suite/falcon/t/falcon_bug_25555.test
mysql-test/suite/falcon/t/falcon_bug_26057.test
mysql-test/suite/falcon/t/falcon_bug_27697.test
mysql-test/suite/falcon/t/falcon_bug_29246.test
mysql-test/suite/falcon/t/falcon_bug_30480_A.test
mysql-test/suite/falcon/t/falcon_bug_30480_B.test
mysql-test/suite/falcon/t/falcon_bug_32398.test
mysql-test/suite/falcon/t/falcon_bug_32833.test
mysql-test/suite/falcon/t/falcon_bug_38304.test
mysql-test/suite/falcon/t/falcon_bug_39708.test
mysql-test/suite/falcon/t/falcon_bugs.test
mysql-test/suite/falcon/t/falcon_bugs2.test
mysql-test/suite/falcon/t/falcon_deadlock_collection.test
mysql-test/suite/falcon/t/falcon_online_index.test
mysql-test/suite/falcon/t/falcon_select.test
mysql-test/suite/falcon/t/falcon_unicode-big.test
mysql-test/suite/falcon_team/r/falcon_deadlock.result
mysql-test/suite/falcon_team/t/falcon_bug_34174.test
mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test
mysql-test/suite/falcon_team/t/falcon_deadlock.test
mysql-test/suite/falcon_team/t/test2bug.def
mysql-test/suite/funcs_1/datadict/is_tables.inc
mysql-test/suite/funcs_1/r/falcon_storedproc_08.result
mysql-test/suite/funcs_1/r/falcon_trig_0102.result
mysql-test/suite/funcs_1/r/falcon_trig_0407.result
mysql-test/suite/funcs_1/r/falcon_trig_09.result
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
mysql-test/suite/funcs_1/r/innodb_trig_0102.result
mysql-test/suite/funcs_1/r/innodb_trig_0407.result
mysql-test/suite/funcs_1/r/innodb_trig_09.result
mysql-test/suite/funcs_1/r/is_cml_falcon.result
mysql-test/suite/funcs_1/r/is_cml_innodb.result
mysql-test/suite/funcs_1/r/is_cml_memory.result
mysql-test/suite/funcs_1/r/is_cml_myisam.result
mysql-test/suite/funcs_1/r/is_cml_ndb.result
mysql-test/suite/funcs_1/r/is_column_privileges.result
mysql-test/suite/funcs_1/r/is_columns.result
mysql-test/suite/funcs_1/r/is_columns_falcon.result
mysql-test/suite/funcs_1/r/is_columns_innodb.result
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
mysql-test/suite/funcs_1/r/is_columns_is_falcon.result
mysql-test/suite/funcs_1/r/is_columns_memory.result
mysql-test/suite/funcs_1/r/is_columns_myisam.result
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_columns_ndb.result
mysql-test/suite/funcs_1/r/is_events.result
mysql-test/suite/funcs_1/r/is_key_column_usage.result
mysql-test/suite/funcs_1/r/is_routines.result
mysql-test/suite/funcs_1/r/is_schema_privileges.result
mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result
mysql-test/suite/funcs_1/r/is_schemata.result
mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result
mysql-test/suite/funcs_1/r/is_statistics.result
mysql-test/suite/funcs_1/r/is_statistics_mysql.result
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_table_constraints.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_table_privileges.result
mysql-test/suite/funcs_1/r/is_tables.result
mysql-test/suite/funcs_1/r/is_tables_innodb.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
mysql-test/suite/funcs_1/r/is_tables_memory.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysql-test/suite/funcs_1/r/is_triggers.result
mysql-test/suite/funcs_1/r/is_user_privileges.result
mysql-test/suite/funcs_1/r/is_views.result
mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_trig_0102.result
mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_09.result
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
mysql-test/suite/funcs_1/r/myisam_trig_0102.result
mysql-test/suite/funcs_1/r/myisam_trig_0407.result
mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result
mysql-test/suite/funcs_1/r/ndb_trig_0102.result
mysql-test/suite/funcs_1/r/ndb_trig_0407.result
mysql-test/suite/funcs_1/r/ndb_trig_09.result
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/is_columns.test
mysql-test/suite/funcs_1/t/is_user_privileges.test
mysql-test/suite/funcs_1/t/storedproc.test
mysql-test/suite/funcs_1/triggers/triggers_0102.inc
mysql-test/suite/funcs_1/triggers/triggers_0407.inc
mysql-test/suite/funcs_1/triggers/triggers_09.inc
mysql-test/suite/maria/r/maria-big.result
mysql-test/suite/maria/r/maria-big2.result
mysql-test/suite/maria/r/maria-connect.result
mysql-test/suite/maria/r/maria-purge.result
mysql-test/suite/maria/r/maria-recover.result
mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
mysql-test/suite/maria/r/maria-recovery3.result
mysql-test/suite/maria/r/maria.result
mysql-test/suite/maria/r/maria_notembedded.result
mysql-test/suite/maria/r/maria_partition.result
mysql-test/suite/maria/r/ps_maria.result
mysql-test/suite/maria/t/maria-autozerofill.test
mysql-test/suite/maria/t/maria-big.test
mysql-test/suite/maria/t/maria-big2.test
mysql-test/suite/maria/t/maria-connect.test
mysql-test/suite/maria/t/maria-purge.test
mysql-test/suite/maria/t/maria-recover.test
mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
mysql-test/suite/maria/t/maria-recovery3.test
mysql-test/suite/maria/t/maria.test
mysql-test/suite/maria/t/maria3.test
mysql-test/suite/maria/t/maria_notembedded.test
mysql-test/suite/maria/t/maria_partition.test
mysql-test/suite/maria/t/maria_showlog_error.test
mysql-test/suite/maria/t/ps_maria.test
mysql-test/suite/ndb/r/ndb_dd_alter.result
mysql-test/suite/ndb/r/ndb_dd_restore_compat.result
mysql-test/suite/ndb/r/ndb_partition_range.result
mysql-test/suite/ndb/r/ndb_read_multi_range.result
mysql-test/suite/ndb/r/ndb_restore.result
mysql-test/suite/ndb/r/ps_7ndb.result
mysql-test/suite/ndb/t/ndb_read_multi_range.test
mysql-test/suite/parts/inc/partition_auto_increment.inc
mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
mysql-test/suite/parts/r/partition_auto_increment_falcon.result
mysql-test/suite/parts/r/partition_auto_increment_innodb.result
mysql-test/suite/parts/r/partition_auto_increment_maria.result
mysql-test/suite/parts/r/partition_auto_increment_memory.result
mysql-test/suite/parts/r/partition_auto_increment_myisam.result
mysql-test/suite/parts/r/partition_auto_increment_ndb.result
mysql-test/suite/rpl/r/rpl_extraColmaster_falcon.result
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
mysql-test/suite/rpl/r/rpl_sp.result
mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
mysql-test/suite/rpl/r/rpl_truncate_falcon.result
mysql-test/suite/rpl/t/rpl_cross_version.test
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
mysql-test/suite/rpl/t/rpl_heartbeat.test
mysql-test/suite/rpl/t/rpl_truncate_falcon.test
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/t/auto_increment.test
mysql-test/t/check.test
mysql-test/t/compress.test
mysql-test/t/csv_not_null.test
mysql-test/t/ctype_utf8.test
mysql-test/t/delayed.test
mysql-test/t/disabled.def
mysql-test/t/fulltext.test
mysql-test/t/func_misc.test
mysql-test/t/func_sapdb.test
mysql-test/t/func_str.test
mysql-test/t/grant.test
mysql-test/t/grant2.test
mysql-test/t/grant3.test
mysql-test/t/information_schema.test
mysql-test/t/innodb_mysql.test
mysql-test/t/join_cache.test
mysql-test/t/lock_tables_lost_commit.test
mysql-test/t/lowercase_table.test
mysql-test/t/lowercase_table3.test
mysql-test/t/merge.test
mysql-test/t/multi_update.test
mysql-test/t/myisampack.test
mysql-test/t/mysqldump.test
mysql-test/t/null.test
mysql-test/t/openssl_1.test
mysql-test/t/outfile.test
mysql-test/t/overflow.test
mysql-test/t/packet.test
mysql-test/t/partition_pruning.test
mysql-test/t/query_cache_notembedded.test
mysql-test/t/read_only.test
mysql-test/t/rename.test
mysql-test/t/sp-threads.test
mysql-test/t/status.test
mysql-test/t/subselect.test
mysql-test/t/synchronization.test
mysql-test/t/timezone_grant.test
mysql-test/t/type_datetime.test
mysql-test/t/type_float.test
mysql-test/t/warnings.test
mysql-test/t/windows.test
mysql-test/t/xml.test
mysys/Makefile.am
mysys/lf_alloc-pin.c
mysys/lf_hash.c
mysys/my_static.c
mysys/my_thr_init.c
mysys/tests/Makefile.am
mysys/thr_lock.c
mysys/thr_mutex.c
mysys/waiting_threads.c
netware/Makefile.am
plugin/Makefile.am
plugin/audit_null/Makefile.am
plugin/daemon_example/Makefile.am
plugin/fulltext/Makefile.am
pstack/Makefile.am
pstack/aout/Makefile.am
regex/Makefile.am
scripts/Makefile.am
scripts/make_win_bin_dist
scripts/mysqld_multi.sh
sql-bench/Makefile.am
sql-bench/bench-init.pl.sh
sql-bench/test-create.sh
sql-common/Makefile.am
sql-common/my_time.c
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/Makefile.am
sql/backup/backup_info.cc
sql/backup/kernel.cc
sql/debug_sync.cc
sql/ha_ndbcluster.cc
sql/handler.cc
sql/item.cc
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_timefunc.h
sql/item_xmlfunc.cc
sql/lock.cc
sql/log_event.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/protocol.cc
sql/set_var.cc
sql/share/Makefile.am
sql/share/errmsg.txt
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_db.cc
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_join_cache.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_show.h
sql/sql_string.cc
sql/sql_tablespace.cc
sql/sql_update.cc
sql/sql_yacc.yy
sql/table.cc
storage/Makefile.am
storage/archive/Makefile.am
storage/blackhole/Makefile.am
storage/csv/Makefile.am
storage/example/Makefile.am
storage/falcon/BackLog.cpp
storage/falcon/CMakeLists.txt
storage/falcon/Connection.cpp
storage/falcon/DataPage.h
storage/falcon/Database.cpp
storage/falcon/Database.h
storage/falcon/DateTime.cpp
storage/falcon/Dbb.cpp
storage/falcon/Dbb.h
storage/falcon/DeferredIndex.cpp
storage/falcon/DeferredIndex.h
storage/falcon/Engine.h
storage/falcon/IO.cpp
storage/falcon/Index.cpp
storage/falcon/Interlock.h
storage/falcon/Makefile.am
storage/falcon/MemMgr.cpp
storage/falcon/MemMgr.h
storage/falcon/PageInventoryPage.cpp
storage/falcon/Record.cpp
storage/falcon/Record.h
storage/falcon/RecordGroup.cpp
storage/falcon/RecordGroup.h
storage/falcon/RecordLeaf.cpp
storage/falcon/RecordLeaf.h
storage/falcon/RecordLocatorPage.cpp
storage/falcon/RecordScavenge.cpp
storage/falcon/RecordScavenge.h
storage/falcon/RecordSection.cpp
storage/falcon/RecordSection.h
storage/falcon/RecordVersion.cpp
storage/falcon/RecordVersion.h
storage/falcon/SRLCommit.cpp
storage/falcon/SRLCreateTableSpace.cpp
storage/falcon/SRLPrepare.cpp
storage/falcon/SRLRollback.cpp
storage/falcon/SRLRollback.h
storage/falcon/SRLUpdateIndex.cpp
storage/falcon/SRLUpdateRecords.cpp
storage/falcon/SRLUpdateRecords.h
storage/falcon/SRLVersion.h
storage/falcon/Scavenger.cpp
storage/falcon/Section.cpp
storage/falcon/SerialLog.cpp
storage/falcon/SerialLogControl.cpp
storage/falcon/SerialLogControl.h
storage/falcon/SerialLogRecord.cpp
storage/falcon/SerialLogRecord.h
storage/falcon/SparseArray.h
storage/falcon/Statement.cpp
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageDatabase.h
storage/falcon/StorageHandler.cpp
storage/falcon/StorageParameters.h
storage/falcon/StorageTable.cpp
storage/falcon/StorageTable.h
storage/falcon/StorageTableShare.cpp
storage/falcon/StorageTableShare.h
storage/falcon/StorageVersion.h
storage/falcon/SyncObject.cpp
storage/falcon/SyncObject.h
storage/falcon/Table.cpp
storage/falcon/Table.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
storage/falcon/Thread.cpp
storage/falcon/Thread.h
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
storage/falcon/TransactionManager.cpp
storage/falcon/TransactionManager.h
storage/falcon/TransformLib/Makefile.am
storage/falcon/ha_falcon.cpp
storage/falcon/ha_falcon.h
storage/falcon/plug.in
storage/federated/Makefile.am
storage/heap/Makefile.am
storage/innobase/Makefile.am
storage/innobase/handler/ha_innodb.cc
storage/maria/CMakeLists.txt
storage/maria/Makefile.am
storage/maria/ha_maria.cc
storage/maria/ha_maria.h
storage/maria/ma_bitmap.c
storage/maria/ma_blockrec.c
storage/maria/ma_blockrec.h
storage/maria/ma_check.c
storage/maria/ma_check_standalone.h
storage/maria/ma_checkpoint.c
storage/maria/ma_close.c
storage/maria/ma_commit.c
storage/maria/ma_create.c
storage/maria/ma_dbug.c
storage/maria/ma_delete.c
storage/maria/ma_delete_all.c
storage/maria/ma_delete_table.c
storage/maria/ma_dynrec.c
storage/maria/ma_extra.c
storage/maria/ma_ft_boolean_search.c
storage/maria/ma_ft_parser.c
storage/maria/ma_ft_update.c
storage/maria/ma_ftdefs.h
storage/maria/ma_init.c
storage/maria/ma_key_recover.c
storage/maria/ma_locking.c
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.h
storage/maria/ma_open.c
storage/maria/ma_pagecache.c
storage/maria/ma_pagecache.h
storage/maria/ma_pagecrc.c
storage/maria/ma_recovery.c
storage/maria/ma_rename.c
storage/maria/ma_rt_index.c
storage/maria/ma_state.c
storage/maria/ma_state.h
storage/maria/ma_static.c
storage/maria/ma_write.c
storage/maria/maria_chk.c
storage/maria/maria_def.h
storage/maria/maria_pack.c
storage/maria/maria_read_log.c
storage/maria/plug.in
storage/maria/trnman.c
storage/maria/trnman.h
storage/maria/trnman_public.h
storage/maria/unittest/Makefile.am
storage/maria/unittest/ma_pagecache_consist.c
storage/maria/unittest/ma_pagecache_rwconsist.c
storage/maria/unittest/ma_pagecache_rwconsist2.c
storage/maria/unittest/ma_pagecache_single.c
storage/maria/unittest/ma_test_loghandler_pagecache-t.c
storage/maria/unittest/trnman-t.c
storage/myisam/Makefile.am
storage/myisam/mi_create.c
storage/myisam/mi_delete.c
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisam_backup_engine.cc
storage/myisam/myisamdef.h
storage/myisam/myisampack.c
storage/myisammrg/Makefile.am
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.h
storage/myisammrg/myrg_open.c
storage/ndb/Makefile.am
storage/ndb/config/common.mk.am
storage/ndb/config/type_kernel.mk.am
storage/ndb/config/type_mgmapiclient.mk.am
storage/ndb/config/type_ndbapi.mk.am
storage/ndb/config/type_ndbapiclient.mk.am
storage/ndb/config/type_ndbapitest.mk.am
storage/ndb/config/type_ndbapitools.mk.am
storage/ndb/config/type_util.mk.am
storage/ndb/docs/Makefile.am
storage/ndb/include/Makefile.am
storage/ndb/src/Makefile.am
storage/ndb/src/common/Makefile.am
storage/ndb/src/common/debugger/Makefile.am
storage/ndb/src/common/debugger/signaldata/Makefile.am
storage/ndb/src/common/logger/Makefile.am
storage/ndb/src/common/mgmcommon/Makefile.am
storage/ndb/src/common/portlib/Makefile.am
storage/ndb/src/common/transporter/Makefile.am
storage/ndb/src/common/transporter/TransporterRegistry.cpp
storage/ndb/src/common/util/Makefile.am
storage/ndb/src/cw/Makefile.am
storage/ndb/src/cw/cpcd/Makefile.am
storage/ndb/src/kernel/Makefile.am
storage/ndb/src/kernel/blocks/Makefile.am
storage/ndb/src/kernel/blocks/backup/Makefile.am
storage/ndb/src/kernel/blocks/dbdict/Makefile.am
storage/ndb/src/kernel/blocks/dbdih/Makefile.am
storage/ndb/src/kernel/blocks/dblqh/Makefile.am
storage/ndb/src/kernel/blocks/dbtup/Makefile.am
storage/ndb/src/kernel/error/Makefile.am
storage/ndb/src/kernel/vm/Makefile.am
storage/ndb/src/mgmapi/Makefile.am
storage/ndb/src/mgmclient/Makefile.am
storage/ndb/src/mgmsrv/Makefile.am
storage/ndb/src/ndbapi/Makefile.am
storage/ndb/swig/Makefile.am
storage/ndb/test/Makefile.am
storage/ndb/test/ndbapi/Makefile.am
storage/ndb/test/ndbapi/bank/Makefile.am
storage/ndb/test/run-test/Makefile.am
storage/ndb/test/src/Makefile.am
storage/ndb/test/tools/Makefile.am
storage/ndb/tools/Makefile.am
strings/Makefile.am
support-files/MacOSX/Makefile.am
support-files/Makefile.am
support-files/RHEL4-SElinux/Makefile.am
support-files/mysql.spec.sh
tests/Makefile.am
unittest/Makefile.am
unittest/examples/Makefile.am
unittest/mysys/Makefile.am
unittest/mysys/lf-t.c
unittest/mysys/my_atomic-t.c
unittest/mysys/thr_template.c
unittest/mysys/waiting_threads-t.c
unittest/mytap/Makefile.am
unittest/mytap/t/Makefile.am
vio/Makefile.am
win/Makefile.am
win/configure.js
zlib/Makefile.am
mysql-test/suite/falcon/r/falcon_bug_26433.result
mysql-test/suite/falcon/t/falcon_bug_26433.test
mysql-test/suite/falcon_team/t/falcon_bug_36294-big.test
netware/BUILD/nwbuild
=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result 2009-01-31 15:53:35 +0000
+++ b/mysql-test/r/variables.result 2009-02-24 11:25:46 +0000
@@ -1341,3 +1341,168 @@ SET @@session.thread_stack= 7;
ERROR HY000: Variable 'thread_stack' is a read only variable
SET @@global.thread_stack= 7;
ERROR HY000: Variable 'thread_stack' is a read only variable
+
+#
+# Bug#34828: OF is taken as OFF and a value of 0 is set for variable SQL_notes.
+#
+
+# Checking sql_notes...
+SET @sql_notes_saved = @@sql_notes;
+
+SET @@sql_notes = ON;
+SELECT @@sql_notes;
+@@sql_notes
+1
+
+SET @@sql_notes = OF;
+ERROR 42000: Variable 'sql_notes' can't be set to the value of 'OF'
+SELECT @@sql_notes;
+@@sql_notes
+1
+
+SET @@sql_notes = OFF;
+SELECT @@sql_notes;
+@@sql_notes
+0
+
+SET @@sql_notes = @sql_notes_saved;
+
+# Checking delay_key_write...
+SET @delay_key_write_saved = @@delay_key_write;
+
+SET GLOBAL delay_key_write = ON;
+SELECT @@delay_key_write;
+@@delay_key_write
+ON
+
+SET GLOBAL delay_key_write = OF;
+ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'OF'
+SELECT @@delay_key_write;
+@@delay_key_write
+ON
+
+SET GLOBAL delay_key_write = AL;
+ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'AL'
+SELECT @@delay_key_write;
+@@delay_key_write
+ON
+
+SET GLOBAL delay_key_write = OFF;
+SELECT @@delay_key_write;
+@@delay_key_write
+OFF
+
+SET GLOBAL delay_key_write = ALL;
+SELECT @@delay_key_write;
+@@delay_key_write
+ALL
+
+SET GLOBAL delay_key_write = @delay_key_write_saved;
+
+# Checking sql_safe_updates...
+SET @sql_safe_updates_saved = @@sql_safe_updates;
+
+SET @@sql_safe_updates = ON;
+SELECT @@sql_safe_updates;
+@@sql_safe_updates
+1
+
+SET @@sql_safe_updates = OF;
+ERROR 42000: Variable 'sql_safe_updates' can't be set to the value of 'OF'
+SELECT @@sql_safe_updates;
+@@sql_safe_updates
+1
+
+SET @@sql_safe_updates = OFF;
+SELECT @@sql_safe_updates;
+@@sql_safe_updates
+0
+
+SET @@sql_safe_updates = @sql_safe_updates_saved;
+
+# Checking foreign_key_checks...
+SET @foreign_key_checks_saved = @@foreign_key_checks;
+
+SET @@foreign_key_checks = ON;
+SELECT @@foreign_key_checks;
+@@foreign_key_checks
+1
+
+SET @@foreign_key_checks = OF;
+ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'OF'
+SELECT @@foreign_key_checks;
+@@foreign_key_checks
+1
+
+SET @@foreign_key_checks = OFF;
+SELECT @@foreign_key_checks;
+@@foreign_key_checks
+0
+
+SET @@foreign_key_checks = @foreign_key_checks_saved;
+
+# Checking unique_checks...
+SET @unique_checks_saved = @@unique_checks;
+
+SET @@unique_checks = ON;
+SELECT @@unique_checks;
+@@unique_checks
+1
+
+SET @@unique_checks = OF;
+ERROR 42000: Variable 'unique_checks' can't be set to the value of 'OF'
+SELECT @@unique_checks;
+@@unique_checks
+1
+
+SET @@unique_checks = OFF;
+SELECT @@unique_checks;
+@@unique_checks
+0
+
+SET @@unique_checks = @unique_checks_saved;
+
+# Checking sql_buffer_result...
+SET @sql_buffer_result_saved = @@sql_buffer_result;
+
+SET @@sql_buffer_result = ON;
+SELECT @@sql_buffer_result;
+@@sql_buffer_result
+1
+
+SET @@sql_buffer_result = OF;
+ERROR 42000: Variable 'sql_buffer_result' can't be set to the value of 'OF'
+SELECT @@sql_buffer_result;
+@@sql_buffer_result
+1
+
+SET @@sql_buffer_result = OFF;
+SELECT @@sql_buffer_result;
+@@sql_buffer_result
+0
+
+SET @@sql_buffer_result = @sql_buffer_result_saved;
+
+# Checking sql_quote_show_create...
+SET @sql_quote_show_create_saved = @@sql_quote_show_create;
+
+SET @@sql_quote_show_create = ON;
+SELECT @@sql_quote_show_create;
+@@sql_quote_show_create
+1
+
+SET @@sql_quote_show_create = OF;
+ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'OF'
+SELECT @@sql_quote_show_create;
+@@sql_quote_show_create
+1
+
+SET @@sql_quote_show_create = OFF;
+SELECT @@sql_quote_show_create;
+@@sql_quote_show_create
+0
+
+SET @@sql_quote_show_create = @sql_quote_show_create_saved;
+
+# End of Bug#34828.
+
=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test 2009-02-13 16:30:54 +0000
+++ b/mysql-test/t/variables.test 2009-02-24 11:25:46 +0000
@@ -1083,3 +1083,165 @@ SET @@session.thread_stack= 7;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@global.thread_stack= 7;
#
+
+###########################################################################
+
+--echo
+--echo #
+--echo # Bug#34828: OF is taken as OFF and a value of 0 is set for variable SQL_notes.
+--echo #
+--echo
+
+--echo # Checking sql_notes...
+SET @sql_notes_saved = @@sql_notes;
+
+--echo
+SET @@sql_notes = ON;
+SELECT @@sql_notes;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@sql_notes = OF;
+SELECT @@sql_notes;
+
+--echo
+SET @@sql_notes = OFF;
+SELECT @@sql_notes;
+
+--echo
+SET @@sql_notes = @sql_notes_saved;
+
+--echo
+--echo # Checking delay_key_write...
+SET @delay_key_write_saved = @@delay_key_write;
+
+--echo
+SET GLOBAL delay_key_write = ON;
+SELECT @@delay_key_write;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL delay_key_write = OF;
+SELECT @@delay_key_write;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL delay_key_write = AL;
+SELECT @@delay_key_write;
+
+--echo
+SET GLOBAL delay_key_write = OFF;
+SELECT @@delay_key_write;
+
+--echo
+SET GLOBAL delay_key_write = ALL;
+SELECT @@delay_key_write;
+
+--echo
+SET GLOBAL delay_key_write = @delay_key_write_saved;
+
+--echo
+--echo # Checking sql_safe_updates...
+SET @sql_safe_updates_saved = @@sql_safe_updates;
+
+--echo
+SET @@sql_safe_updates = ON;
+SELECT @@sql_safe_updates;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@sql_safe_updates = OF;
+SELECT @@sql_safe_updates;
+
+--echo
+SET @@sql_safe_updates = OFF;
+SELECT @@sql_safe_updates;
+
+--echo
+SET @@sql_safe_updates = @sql_safe_updates_saved;
+
+--echo
+--echo # Checking foreign_key_checks...
+SET @foreign_key_checks_saved = @@foreign_key_checks;
+
+--echo
+SET @@foreign_key_checks = ON;
+SELECT @@foreign_key_checks;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@foreign_key_checks = OF;
+SELECT @@foreign_key_checks;
+
+--echo
+SET @@foreign_key_checks = OFF;
+SELECT @@foreign_key_checks;
+
+--echo
+SET @@foreign_key_checks = @foreign_key_checks_saved;
+
+--echo
+--echo # Checking unique_checks...
+SET @unique_checks_saved = @@unique_checks;
+
+--echo
+SET @@unique_checks = ON;
+SELECT @@unique_checks;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@unique_checks = OF;
+SELECT @@unique_checks;
+
+--echo
+SET @@unique_checks = OFF;
+SELECT @@unique_checks;
+
+--echo
+SET @@unique_checks = @unique_checks_saved;
+
+--echo
+--echo # Checking sql_buffer_result...
+SET @sql_buffer_result_saved = @@sql_buffer_result;
+
+--echo
+SET @@sql_buffer_result = ON;
+SELECT @@sql_buffer_result;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@sql_buffer_result = OF;
+SELECT @@sql_buffer_result;
+
+--echo
+SET @@sql_buffer_result = OFF;
+SELECT @@sql_buffer_result;
+
+--echo
+SET @@sql_buffer_result = @sql_buffer_result_saved;
+
+--echo
+--echo # Checking sql_quote_show_create...
+SET @sql_quote_show_create_saved = @@sql_quote_show_create;
+
+--echo
+SET @@sql_quote_show_create = ON;
+SELECT @@sql_quote_show_create;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@sql_quote_show_create = OF;
+SELECT @@sql_quote_show_create;
+
+--echo
+SET @@sql_quote_show_create = OFF;
+SELECT @@sql_quote_show_create;
+
+--echo
+SET @@sql_quote_show_create = @sql_quote_show_create_saved;
+
+--echo
+--echo # End of Bug#34828.
+--echo
+
+###########################################################################
=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc 2009-02-16 21:18:45 +0000
+++ b/sql/set_var.cc 2009-02-24 11:25:46 +0000
@@ -1840,7 +1840,7 @@ bool sys_var::check_enum(THD *thd, set_v
if (!(res=var->value->val_str(&str)) ||
((long) (var->save_result.ulong_value=
(ulong) find_type(enum_names, res->ptr(),
- res->length(),1)-1)) < 0)
+ res->length(), FALSE) - 1)) < 0)
{
value= res ? res->c_ptr() : "NULL";
goto err;
| Thread |
|---|
| • bzr push into mysql-6.0 branch (alik:2730 to 2731) Bug#34828 | Alexander Nozdrin | 24 Feb |
