- 04 May, 2007 2 commits
-
-
unknown authored
Move copying of global variables into thd.variables into plugin_thdvar_init(). plugin_thdvar_init() may be called multiple times when THD::change_user() is called. This fixes a plugin ref-count leak when running the test mysql_client_test sql/sql_class.cc: wl2936 Initialize thd.variables to zero in constructor. Move copying of global variables into thd.variables into plugin_thdvar_init() sql/sql_plugin.cc: wl2936 Move copying of global variables into thd.variables into plugin_thdvar_init(). plugin_thdvar_init() may be called multiple times when THD::change_user() is called. This fixes a plugin ref-count leak when running the test mysql_client_test
-
unknown authored
Fix tests when InnoDB is not built-in. Innodb options would cause mysqld to abort with an error indicating that the option is unknown. Fix tests on Windows where mysql-test-run.pl was unable to probe mysqld for version and variables information, caused by output being redirected to a log file instead. mysql-test/mysql-test-run.pl: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/binlog_row_mix_innodb_myisam-master.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is not required here. This test case runs only if innodb is available. In this case the option must be present. mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is not required here. This test case runs only if innodb is available. In this case the option must be present. mysql-test/t/federated_transactions-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/myisam-blob-master.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_auto_increment-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_deadlock_innodb-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_insert_id-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_insert_id_pk-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_insert_ignore-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_multi_engine-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_ndb_relayrotate-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_read_only-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_relayrotate-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_row_basic_11bugs-master.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_row_basic_11bugs-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_row_create_table-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_row_func003-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_row_sp003-master.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_row_sp003-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/rpl_stm_000001-slave.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. mysql-test/t/warnings-master.opt: WL#2936 - Falcon & MySQL plugin interface: server variables 'loose' prefix is required on command line options which may be ignored if the plugin for which the option is intended is not installed/builtin to mysqld. sql/mysqld.cc: WL#2936 - Falcon & MySQL plugin interface: server variables Do not enable the 'old-fashioned error log' when the user has '--help' specified on the command line. We do want the help output sent to the console. This fixes help output on Windows because it enables this option by default.
-
- 02 May, 2007 1 commit
-
-
unknown authored
Fix compiler warnings, Fix help output - this fixes im test failures. Fix incomplete change of SET plugin vars to ulonglong. Allow ER() to work without crashing when errmsg.sys has not been loaded. include/mysql/plugin.h: wl2936 slip in const modifier for default values, this removes compiler warnings when assigning a string const as default value. sql/derror.cc: WL2936 Allow init_errmessage() to return upon failure. Initialize errmesg to an array of empty strings if it failed to load errmsg.sys sql/mysqld.cc: wl2936 Include Ingo's compiler-warnings fix. If init_errmessage() failed to load errmsg.sys, abort. Failure to set working directory not fatal when '--help' is specified, as server will terminate anyway after displaying help information. sql/sql_plugin.cc: wl2936 complete change of SET vars from ulong to ulonglong.
-
- 01 May, 2007 1 commit
-
-
unknown authored
storage/innobase/handler/ha_innodb.cc: strict compilers did not permit auto casting 'longlong*' to 'long long *' storage/innobase/handler/ha_innodb.h: strict compilers did not permit auto casting 'longlong*' to 'long long *'
-
- 30 Apr, 2007 6 commits
-
-
unknown authored
into xiphis.org:/home/antony/work2/mysql-5.1-engines.fixme sql/sql_plugin.cc: Auto merged
-
unknown authored
Change SET variables to be ulonglong type (64bit) include/mysql/plugin.h: WL2936 Change SET variables to be unsigned long long type Changed use of ulonglong to unsigned long long sql/sql_plugin.cc: WL2936 Change SET variables to be ulonglong type (64bit)
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-wl2936-two
-
unknown authored
Avoid compiler warnings cmd-line-utils/readline/rltty.c: Avoid a compiler warning config/ac-macros/misc.m4: Avoid a compiler warning, which could abort ./configure if CFLAGS contain -Werror.
-
unknown authored
scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized mysql-test/mysql-test-run.pl: another mysqld --help fix scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized
-
unknown authored
include/my_global.h: only use compile_time_assert on gcc mysql-test/mysql-test-run.pl: better --datadir for mysqld --help sql/mysql_priv.h: error-prone but concatenation-friendly IF_NETWARE() storage/innobase/handler/ha_innodb.cc: no preprocessor directives inside macro arguments
-
- 29 Apr, 2007 8 commits
-
-
unknown authored
sql/sql_lex.cc: remove bad fix
-
unknown authored
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936 include/mysql/plugin.h: Auto merged
-
unknown authored
VC++ does not like compile_time_assert() macro
-
unknown authored
-
unknown authored
-
unknown authored
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936 sql/sql_plugin.cc: merged
-
unknown authored
-
unknown authored
fix compile error when DBUG_OFF sql/sql_plugin.cc: fix compile error when DBUG_OFF
-
- 28 Apr, 2007 2 commits
- 27 Apr, 2007 4 commits
-
-
unknown authored
Changed back (type != OPT_SESSION) to (type == OPT_GLOBAL)
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-wl2936-two mysql-test/mysql-test-run.pl: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
provide the writable datadir for mysqld --help (for lower_case test) sql/log.h, sql/mysqld.cc make default binlog_format value to be 0 (for a hack of using GET_STR for enum to continue to work) mysql-test/mysql-test-run.pl: provide the writable datadir for mysqld --help (for lower_case test) sql/log.h: make default binlog_format value to be 0 (for a hack of using GET_STR for enum to continue to work) sql/mysqld.cc: make default binlog_format value to be 0 (for a hack of using GET_STR for enum to continue to work)
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-wl2936-two client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ndb_dd_basic.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/ndb_dd_basic.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/hash.c: Auto merged sql/event_queue.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_connect.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged include/typelib.h: WL#2936 - Falcon & MySQL plugin interface: server variables Manual merge mysys/typelib.c: WL#2936 - Falcon & MySQL plugin interface: server variables Manual merge
-
- 26 Apr, 2007 15 commits
-
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines sql/item_func.cc: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
-
unknown authored
Ingo's patch: WL#2936 - Falcon & MySQL plugin interface: server variables Added initialization for plugin string variables with their default values. Added deallocation of string values before a plugin and its variables is deleted. Added examples to plugin_example mysys/my_getopt.c: Ingo's patch: WL#2936 - Falcon & MySQL plugin interface: server variables Added initialization for string options. Since string variables do often have their default value assigned already, assign the default value only if the variable value is NULL. plugin/fulltext/plugin_example.c: Ingo's patch: WL#2936 - Falcon & MySQL plugin interface: server variables Added examples for thread variables, which have a SESSION and a GLOBAL value. sql/mysqld.cc: removed second fix_paths() in --help output (memory leak). removed invalid string defaul values (binlog_format) don't hide the error message in the help text sql/sql_plugin.cc: don't do plugin_dl_del for built-in plugins (sigsegv). Ingo's patch: WL#2936 - Falcon & MySQL plugin interface: server variables Clearing newly allocated variable value space. This is important for string variables. They are initialized to their default value only if their initial value is NULL. Setting default values for strings. Added a function to free global value space for string variables. Call the function before deleting a plugin and its variables.
-
unknown authored
into trift-lap.fambruehe:/MySQL/M51/push-5.1 mysql-test/Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysql_system_tables.sql: Auto merged scripts/mysql_system_tables_data.sql: Auto merged sql/item_subselect.h: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/test/ndbapi/testScanFilter.cpp: Auto merged BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547: No need to propagate 5.0 changes into a 5.1 file which is deleted anyway. Makefile.am: Add "funcs_1" and "funcs_2" to the 5.1 version of the "test-bt" target. storage/ndb/src/ndbapi/NdbImpl.hpp: Manual merge from 5.0.40
-
unknown authored
into trift-lap.fambruehe:/MySQL/M50/push-5.0 Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysql_system_tables.sql: Auto merged scripts/mysql_system_tables_data.sql: Auto merged sql/item_subselect.h: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Manual merge: Use the symbolic constant. ndb/test/ndbapi/testScanFilter.cpp: Manual merge: Use the standard text.
-
unknown authored
into trift-lap.fambruehe:/MySQL/M51/push-5.1 configure.in: Auto merged include/Makefile.am: Auto merged
-
unknown authored
into trift-lap.fambruehe:/MySQL/M50/push-5.0
-
unknown authored
into trift-lap.fambruehe:/MySQL/M41/push-4.1
-
unknown authored
into trift-lap.fambruehe:/MySQL/M50/push-5.0 configure.in: Auto merged include/Makefile.am: Auto merged
-
unknown authored
into trift-lap.fambruehe:/MySQL/M51/push-5.1 configure.in: Auto merged include/Makefile.am: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/partition.test: Auto merged mysql-test/t/sp.test: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_delete.cc: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
-
unknown authored
mysql-test/t/partition.test: Disable warnings around CREATE TABLE ... ENGINE=BLACKHOLE to make this test case work without Blackhole compiled into the server. mysql-test/t/partition_hash.test: Disable warnings around CREATE TABLE ... ENGINE=BLACKHOLE to make this test case work without Blackhole compiled into the server.
-
- 25 Apr, 2007 1 commit
-
-
unknown authored
mysql-test/t/partition_not_windows-master.opt: BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/partition_not_windows-master.opt mysql-test/t/partition_not_windows.test: Tweak comments to be more meaningful
-