summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/svoj/devel/bk/mysql-5.1unknown2007-05-231-19/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: Auto merged sql/handler.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged
| * BUG#28341 - Security issue still in library loadingunknown2007-05-181-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UDF can be created from any library in any part of the server LD_LIBRARY_PATH. Allow to load udfs only from plugin_dir. On windows, refuse to open udf in case it's path contains a slash. No good test case for this bug because of imperfect error message that includes error code and error string when it fails to dlopen a library. mysql-test/mysql-test-run.pl: Since plugins are allowed to be open only from plugin_dir: - there is no sence to update LD_LIBRARY_PATH - there is no sence to add plugin_dir arg by default - set UDF_EXAMPLE_LIB_OPT and EXAMPLE_PLUGIN_OPT to be used by udf and plugin tests accordingly. mysql-test/r/plugin.result: Updated test result (we report addition warning). sql/sql_udf.cc: Allow to load udfs only from plugin_dir. On windows, refuse to open udf in case it's path contains a slash. mysql-test/t/plugin-master.opt: New BitKeeper file ``mysql-test/t/plugin-master.opt'' mysql-test/t/udf-master.opt: New BitKeeper file ``mysql-test/t/udf-master.opt''
* | Merge siva.hindu.god:/home/tsmith/m/bk/51unknown2007-05-171-22/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/51 client/mysqltest.c: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/outfile.test: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_show.cc: Auto merged sql/structs.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged
| * Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesunknown2007-05-071-21/+28
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/mysql-5.1-merge mysql-test/mysql-test-run.pl: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged
| | * Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesunknown2007-05-041-21/+28
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/mysql_install_db.sh: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.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/table.cc: Auto merged sql/table.h: Auto merged storage/innobase/handler/ha_innodb.cc: manual change to new api
| | | * WL#2936 - Falcon & MySQL plugin interface: server variablesunknown2007-05-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * mysql-test/mysql-test-run.pl: another mysqld --help fixunknown2007-04-301-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * compilation/test fixesunknown2007-04-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936unknown2007-04-271-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-wl2936-two mysql-test/mysql-test-run.pl: Auto merged sql/mysqld.cc: Auto merged
| | | | * mysql-test/mysql-test-run.plunknown2007-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-04-271-17/+22
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * mysql-test/mysql-test-run.plunknown2007-04-181-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set --language correctly even for --help (to have full plugin help) mysql-test/lib/mtr_cases.pl more robust check for innodb mysql-test/lib/mtr_cases.pl: more robust check for innodb mysql-test/mysql-test-run.pl: set --language correctly even for --help (to have full plugin help)
| | | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-161-8/+11
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936 client/mysql.cc: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/ndb_dd_basic.test: Auto merged mysql-test/t/partition_innodb.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/array.c: Auto merged mysys/typelib.c: Auto merged sql/event_queue.cc: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: 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/set_var.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: 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_partition.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/table.cc: Auto merged sql/table.h: Auto merged storage/example/ha_example.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/ha_heap.cc: Auto merged storage/innobase/include/trx0trx.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged include/typelib.h: merged mysql-test/mysql-test-run.pl: merged mysql-test/r/flush2.result: merged mysql-test/r/ndb_dd_basic.result: merged mysql-test/r/partition_innodb.result: merged mysql-test/r/ps_1general.result: merged mysql-test/t/ps_1general.test: merged sql/ha_ndbcluster.cc: merged sql/item_create.cc: merged sql/mysqld.cc: merged sql/rpl_utility.h: merged sql/set_var.cc: merged sql/sql_class.cc: merged sql/sql_yacc.yy: merged storage/innobase/handler/ha_innodb.cc: merged storage/innobase/handler/ha_innodb.h: merged
| | | | | * more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone),unknown2007-04-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed an assert crash include/mysql/plugin.h: more wl#2936 fixes: no implicit ha_thd() calls mysql-test/mysql-test-run.pl: don't load system-wide plugins mysql-test/r/partition_innodb.result: fix the test mysql-test/t/partition_innodb.test: fix the test sql/handler.cc: more wl#2936 fixes: no implicit ha_thd() calls sql/handler.h: more wl#2936 fixes: no implicit ha_thd() calls sql/sql_class.cc: more wl#2936 fixes: no implicit ha_thd() calls sql/sql_plugin.cc: more wl#2936 fixes: assert crash storage/innobase/handler/ha_innodb.cc: more wl#2936 fixes: no implicit ha_thd() calls
| | | | | * wl#2936 - fixing problemsunknown2007-04-131-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/mysql/plugin.h: warning. no int/realsize mysys/my_getopt.c: combination of prefixes (e.g. --loose-skip-) didn't work sql/event_queue.cc: warning sql/handler.cc: assert sql/handler.h: comment sql/item_create.cc: warnings sql/log.cc: warnings sql/mysqld.cc: wl#2936 - fixing problems (memory leak in load_defaults, garbage in opt_[slow_]logname sql/partition_element.h: warnings sql/rpl_utility.h: warnings sql/set_var.cc: comment sql/set_var.h: warnings sql/sql_class.cc: warnings sql/sql_parse.cc: warnings sql/sql_plugin.cc: wl#2936 - fixing problems: portability, coding style, reporting of spurious errors, crashes, incorrect help output storage/example/ha_example.cc: comment storage/innobase/handler/ha_innodb.cc: wl#2936 - fixing problems (crash)
| * | | | | bugfix in checksum with force varpartunknown2007-05-041-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: bigger needed for running some tests
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-05-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Auto merged
| * | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-05-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged
| | * | | | Bug#27344 Total failure to start the serverunknown2007-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Give some more protection against "too long socket name by setting the max length when to use a tmpdir for sockets to 70 mysql-test/mysql-test-run.pl: Give some more protection against "too long socket name by setting the max length when to use a tmpdir for sockets to 70
| | * | | | Add missing option --manual-dddunknown2007-04-131-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change syntax to start manual gdb/ddd to avoid having to cd to the mysql-test directory before calling the command
| | * | | | Bug#27344 Total failure to start the serverunknown2007-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - length($sockdir) >= 80 !! mysql-test/mysql-test-run.pl: Change check to create a tmp file for socket if length($sockdir) >= 80 !!
* | | | | | mysql-test-run.pl:unknown2007-05-011-11/+22
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run master init scripts also for --embedded-server mysql-test/mysql-test-run.pl: Run master init scripts also for --embedded-server
* | | | | Merge siva.hindu.god:/home/tsmith/m/bk/51unknown2007-04-181-4/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/51 client/mysql_upgrade.c: Auto merged client/mysqltest.c: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/type_datetime.result: Auto merged mysys/my_alloc.c: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged
| * | | | | Clear field_alloc when it's moved to result set (allows us to always call ↵unknown2007-04-161-4/+10
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free_root on field_alloc) Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems) Removed memory leak in mysql_test if sync_with_master fails. Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed. Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits" client/mysqltest.c: Added missing 'mysql_free_result' (fixed confusing memory leak when sync_with_master fails)ug mysql-test/mysql-test-run.pl: Add the test case name to the instance manager log files mysql-test/r/rpl_log_pos.result: Made test more portable (for powermac) mysql-test/t/disabled.def: Disabled im_life_cycle (added bug#27851) mysql-test/t/myisam-system.test: Use remove_file instead of "system rm" mysql-test/t/ndb_autodiscover.test: Use remove_file instead of "system rm" mysql-test/t/ndb_loaddatalocal.test: Use remove_file instead of "system rm" mysql-test/t/rpl_loaddatalocal.test: Use remove_file instead of "system rm" mysql-test/t/rpl_log_pos.test: Made test more portable (for powermac) mysql-test/t/rpl_misc_functions.test: Use remove_file instead of "system rm" mysql-test/t/rpl_rbr_to_sbr.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_NOW.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_sp001.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_sp011.test: Use remove_file instead of "system rm" mysql-test/t/show_check.test: Use remove_file instead of "system rm" mysys/my_alloc.c: Don't return on zero argument, as this may hide other errors server-tools/instance-manager/log.cc: Log errors to both stdout and stderr (to know in which context we got the error) server-tools/instance-manager/thread_registry.cc: Log error before common assert (to know in which context we fail) sql/ha_ndbcluster.cc: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql/ha_ndbcluster.h: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql/ha_ndbcluster_binlog.cc: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql-common/client.c: Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-04-131-4/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysql_system_tables.sql: Manual merge scripts/mysql_system_tables_data.sql: Manual merge
| * | | | Add option manual-dddunknown2007-04-131-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change syntax for starting manual ddd or gdb to avoid having to change working dir
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-04-041-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Auto merged
| * | | | Bug#27344 Total failure to start the serverunknown2007-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - length($sockdir) >= 80 !! mysql-test/mysql-test-run.pl: Create a shorter sockdir path as soon as length of sockdir path is equal to 80
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-04-041-6/+2
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint client/mysqltest.c: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/system_mysql_db_fix40123.test: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/t/system_mysql_db_fix30020.test: Merge
| * | | Skip test cases if the script or binary they need can't be found unknown2007-04-041-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: Move some opt_extern hacks to same place. Remove duplicate opt_skip_im=1 if opt_extern mysql-test/t/fix_priv_tables.test: Skip test if $MYSQL_FIX_PRIVILEGE_TABLES is not set mysql-test/t/system_mysql_db_fix30020.test: Skip test if $MYSQL_FIX_SYSTEM_TABLES is not set mysql-test/t/system_mysql_db_fix40123.test: Skip test if $MYSQL_FIX_PRIVILEGE_TABLES is not set
| * | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0unknown2007-04-021-29/+77
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/type_datetime.result: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/gis.result: SCCS merged mysql-test/t/gis.test: SCCS merged
| | * | | Fix spelling errorunknown2007-04-021-1/+1
| | | | |
| * | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-03-231-2/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 mysql-test/mysql-test-run.pl: Auto merged
* | \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1unknown2007-04-021-33/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint client/client_priv.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/rpl_deadlock_innodb.result: Auto merged mysql-test/r/rpl_flushlog_loop.result: Auto merged mysql-test/r/rpl_known_bugs_detection.result: Auto merged mysql-test/r/rpl_ndb_basic.result: Auto merged mysql-test/r/rpl_ndb_extraCol.result: Auto merged mysql-test/r/rpl_ndb_sync.result: Auto merged mysql-test/r/rpl_rbr_to_sbr.result: Auto merged mysql-test/r/rpl_row_inexist_tbl.result: Auto merged mysql-test/r/rpl_row_max_relay_size.result: Auto merged mysql-test/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/r/rpl_row_tabledefs_3innodb.result: Auto merged mysql-test/r/rpl_stm_max_relay_size.result: Auto merged mysql-test/r/rpl_stm_until.result: Auto merged mysql-test/r/sp-code.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/slave.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/gis.result: Merge 5.0->5.1 mysql-test/r/rpl_000015.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_change_master.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_loaddata.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_log_pos.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_ndb_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_rotate_logs.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_log_innodb.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_reset_slave.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_row_until.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_server_id1.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_server_id2.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_stm_log.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/r/rpl_stm_reset_slave.result: Merge after adding new column to SHOW SLAVE STATUS mysql-test/t/gis.test: Merge 5.0->5.1
| * \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-04-021-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Manual merge 5.0->5.1
| | * | | | | Bug#27049 Race condition in test mysqlbinlog.testunknown2007-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases to decide what params to use. mysql-test/mysql-test-run.pl: Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases to decide what params to use.
| | * | | | | Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280unknown2007-03-301-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/mtr_process.pl: Exclude mysql-test/mysql-test-run.pl: Exclude
| | * | | | | Bug#25657 mysql-test-run.pl kill itself under ActiveState perlunknown2007-03-301-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Read the pid from pidfile in order to be able to kill the real process instead of the pseudo process. Most platforms will have the same real_pid as pid - Kill using the real pid mysql-test/lib/mtr_process.pl: Kill using the "real_pid" mysql-test/mysql-test-run.pl: Read the pid from pidfile in order to be able to kill the real process instead of the pseudo process. Most platforms will have the same real_pid as pid
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-291-6/+23
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Merge 5.0->5.1
| | * | | | | Make the script detect --default-storage-engine=x andunknown2007-03-291-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark the test as requiring that storage engine(if we need to do that) Make --ndb and --with-ndbcluster and alias for --mysqld=--default-storage-engine=ndbcluster
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-281-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint extra/yassl/include/openssl/ssl.h: Auto merged extra/yassl/src/ssl.cpp: Auto merged include/violite.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged
| | * | | | | Add back the look for exe_mysqlunknown2007-03-281-0/+1
| | | | | | |
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-281-16/+49
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Auto merged
| | * | | | | Turn off im if externunknown2007-03-281-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove strange comment Add run_query function
| * | | | | | Use mtr_verbose instead of "if ($opt_verbose)"unknown2007-03-281-4/+1
| | | | | | |
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-03-231-7/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint mysql-test/mysql-test-run.pl: Auto merged
| | * | | | | Bug#27070 server logs are created unrequested and in wrong directoryunknown2007-03-231-7/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add output path for slow queries as well mysql-test/mysql-test-run.pl: Send queries to var/log/$type.log and slow queries to var/log/$type-slow.log
* | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-03-271-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch mysql-test/mysql-test-run.pl: Auto merged
| * \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-03-231-2/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 BUILD/check-cpu: Auto merged BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0: Auto merged BitKeeper/deleted/.del-make_win_bin_dist: Auto merged BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c: Auto merged BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822: Auto merged BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85: Auto merged mysql-test/mysql-test-run.pl: Auto merged
| | * | | | | Merge linux.site:/home/omer/source/bld50_0321unknown2007-03-221-2/+10
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into linux.site:/home/omer/source/bld51_0322 mysql-test/mysql-test-run.pl: Auto merged
View Lorry Controller Status