summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-02-28306-18798/+14170
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-rpl_row_charset.test: Auto merged BitKeeper/deleted/.del-rpl_row_charset_innodb.test: Auto merged CMakeLists.txt: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged mysql-test/extra/binlog_tests/blackhole.test: Auto merged mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/ctype_big5.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/system_mysql_db.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/suite/federated/federated.result: Auto merged mysql-test/suite/federated/federated.test: Auto merged mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result: Auto merged mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result: Auto merged mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test: Auto merged mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Auto merged mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Auto merged mysql-test/suite/rpl/r/rpl_timezone.result: Auto merged mysql-test/suite/rpl/t/rpl_load_from_master.test: Auto merged mysql-test/suite/rpl/t/rpl_rotate_logs.test: Auto merged mysql-test/suite/rpl/t/rpl_trigger.test: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/ctype_big5.test: Auto merged mysql-test/t/gis.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/partition.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/system_mysql_db_fix50117.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/trigger_notembedded.test: Auto merged mysql-test/t/type_blob.test: Auto merged mysql-test/t/view.test: Auto merged mysql-test/t/warnings.test: Auto merged sql/ha_ndbcluster.cc: Auto merged mysql-test/Makefile.am: SCCS merged mysql-test/mysql-test-run.pl: Use local version of mtr.pl mysql-test/lib/mtr_cases.pm: Use local mtr_cases.pm mysql-test/suite/rpl/t/disabled.def: Use remote disabled file mysql-test/t/disabled.def: Use remote disabled file sql/ha_ndbcluster_binlog.cc: Use remote mysql-test/extra/rpl_tests/rpl_charset.test: Manual merge mysql-test/lib/mtr_report.pm: Manual merge mysql-test/suite/binlog/r/binlog_killed_simulate.result: Manual merge mysql-test/suite/binlog/r/binlog_multi_engine.result: Manual merge mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Manual merge mysql-test/suite/binlog/r/binlog_stm_blackhole.result: Manual merge mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Manual merge mysql-test/suite/binlog/t/binlog_killed.test: Manual merge mysql-test/suite/binlog/t/binlog_killed_simulate.test: Manual merge mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test: Manual merge mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test: Manual merge mysql-test/suite/ndb/r/ndb_binlog_format.result: Manual merge mysql-test/suite/ndb/r/ndb_restore.result: Manual merge mysql-test/suite/ndb/t/ndb_restore.test: Manual merge mysql-test/suite/rpl/include/rpl_mixed_dml.inc: Manual merge mysql-test/suite/rpl/r/rpl_stm_log.result: Manual merge mysql-test/suite/rpl/t/rpl_row_sp005.test: Manual merge mysql-test/t/log_state.test: Manual merge mysql-test/t/mysqlbinlog.test: Manual merge mysql-test/t/mysqlbinlog2.test: Manual merge mysql-test/t/upgrade.test: Manual merge
| * Add variables fro myisamchk and myisampackunknown2008-02-281-0/+17
| |
| * Use car/tmp as tempdir for mysqld --bootstrapunknown2008-02-281-1/+2
| | | | | | | | | | | | | | Run "mysql --bootstrap" with verbose if turned on
| * Only uise one file for current testunknown2008-02-257-36/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't retry by default Fixes for --embedded mysql-test/lib/My/ConfigFactory.pm: Don't copy log-error to [embedded] section mysql-test/lib/mtr_cases.pm: Auto skip all not_embedded when running with embedded mysql-test/mysql-test-run.pl: Only uise one file for current test Don't retry by default mysql-test/t/csv.test: Change master-data -> mysqld.1/data mysql-test/t/innodb.test: Change master-data -> mysqld.1/data mysql-test/t/ps_1general.test: Change master-data -> mysqld.1/data mysql-test/t/trigger.test: Change master-data -> mysqld.1/data
| * Fix embedded serverunknown2008-02-222-32/+64
| | | | | | | | | | | | | | mysql-test/lib/My/ConfigFactory.pm: Generate [embedded] section mysql-test/mysql-test-run.pl: Fix embedded server support
| * Remove special hack for windows, log-error is already set in my.cnf fileunknown2008-02-221-4/+0
| |
| * Convert to mixed_path under cywin, not native_pathunknown2008-02-221-4/+4
| |
| * Use My::Platformunknown2008-02-207-91/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put all path conversions in one file Convert the --tmpdir passed to "mysqld --verbose --help" mysql-test/lib/My/Find.pm: Use My::Platform mysql-test/lib/My/SafeProcess.pm: use My::Platform mysql-test/lib/mtr_cases.pm: Use My::Platform mysql-test/lib/mtr_misc.pl: Move 'mtr_native_path' to My::Platform mysql-test/lib/My/Platform.pm: New BitKeeper file ``mysql-test/lib/My/Platform.pm'' mysql-test/lib/t/Platform.t: New BitKeeper file ``mysql-test/lib/t/Platform.t''
| * Revert change to check proper return value from QueryPerformanceFrequencyunknown2008-02-191-1/+1
| | | | | | | | | | | | | | since it will be change in other patch
| * Make mtr_report.pl into it's own packageunknown2008-02-044-84/+50
| | | | | | | | | | | | | | | | Remove mtr_log_* BitKeeper/deleted/.del-mtr_settings.pl: Delete: mysql-test/lib/mtr_settings.pl
| * Merge bk-internal:/home/bk/mysql-5.1-maint2unknown2008-02-044-16/+41
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr mysql-test/lib/mtr_cases.pm: Auto merged mysql-test/mysql-test-run.pl: Auto merged
| | * Add --verbose-restartunknown2008-02-044-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/mtr_cases.pm: Fix typo mysql-test/mysql-test-run.pl: Add --verbose-restart Remove unused mysql-test/lib/mtr_report.pl: Add 'mtr_verbose_restart' mysql-test/lib/t/Options.t: Extend uint test
| * | Remove duplcate code after mergeunknown2008-01-181-5/+0
| | |
| * | Merge bk-internal:/home/bk/mysql-5.1-maint2unknown2008-01-1837-6472/+6872
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr mysql-test/lib/My/SafeProcess.pm: Auto merged mysql-test/lib/mtr_cases.pm: Auto merged mysql-test/mysql-test-run.pl: Auto merged
| | * Update test resultunknown2008-01-111-36/+36
| | |
| | * Allow start-from to also filter on suitenameunknown2008-01-112-6/+16
| | |
| | * Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-partsunknown2008-01-1021-6172/+6186
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr mysql-test/lib/mtr_cases.pm: Auto merged
| | | * - Add autodetection of which my.cnfs to use for each testcase if suite doesunknown2008-01-1021-6172/+6186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not have a my.cnf of it's own - Fix paths: master-data => mysqld.1/data, ../std_data_ln => MYSQLTEST_VARDIR/std_data mysql-test/lib/mtr_cases.pm: Add autodetection of which my.cnfs to use for each testcase if suite does not have a my.cnf of it's own mysql-test/suite/parts/inc/partition.pre: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_basic.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_check_drop.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_layout.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_layout_check1.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_layout_check2.inc: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc: Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data mysql-test/suite/parts/r/part_supported_sql_func_innodb.result: Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data mysql-test/suite/parts/r/part_supported_sql_func_myisam.result: Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data mysql-test/suite/parts/r/partition_alter1_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_alter2_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_alter3_innodb.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_alter3_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_alter4_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_basic_innodb.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_basic_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_engine_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_syntax_myisam.result: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/r/partition_t55.out: Update paths, master-data => mysqld.1/data mysql-test/suite/parts/t/partition_sessions.test: Update paths, master-data => mysqld.1/data
| | * | Merge pilot.mysql.com:/data/msvensson/mysql/my51-mtr-bug33748unknown2008-01-101-69/+50
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
| | | * | Bug#33748 my_getsystime, my_micro_time and my_micro_time_and_time broken on ↵unknown2008-01-091-69/+50
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windows - Fix 'my_win_init' code that handles initialization of "query_performance_counter" and conversion from registry values to environment strings mysys/my_init.c: - Change check of return value from 'QueryPerformanceFrequency', it returns 0 on error - Don't return from 'my_win_init' if the registry key "HKEY_LOCAL_MACHINE\SOFTWARE\MySQL" doesn't exist. This caused the initialization of "query_performance_counter" to be bypassed unless there was at lest such a key. - Cleanup the "registry -> environment variables" from Italian comments, remove redundant variables and fix style. - Remove function 'setEnvString' and replace it with oneliner 'strxmov'
| | * | Fix misspelled variable nameunknown2008-01-101-1/+1
| | | |
| | * | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-winunknown2008-01-101-0/+20
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr mysql-test/lib/My/SafeProcess.pm: Auto merged
| | | * | Auto kill any children before exiting from processunknown2008-01-101-0/+20
| | | | |
| | * | | Add --repeat and --retryunknown2008-01-102-7/+58
| | | | |
| | * | | Revert removal of ER_GET_ERRMSGunknown2008-01-101-1/+1
| | | | |
| | * | | Fix bug where local variable masked outer variableunknown2008-01-091-1/+1
| | | | |
| | * | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-bug32275unknown2008-01-093-10/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
| | | * | | Bug#33763 Mysqld leaves readonly mode for cluster tables too early - part2unknown2008-01-093-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Open tables readonly while not properly initialized - Close cached tables when coming out of readonly mode - Apply basically same patch as for 32275 mysql-test/include/ndb_not_readonly.inc: Fix syntax of "die" call Remove the maskin of ER_GET_ERRMSG, should never happen sql/ha_ndbcluster.cc: - Open tables readonly until binlog tables have been initialized sql/ha_ndbcluster_binlog.cc: - Reset "ndb_binlog_tables_inited" when something has happened to schema table, apply status table or when connection to cluster is lost. - Close cached tabled after setting ndb_binlog_is_ready to cleanout any tables opened as readonly.
| | * | | | Add printouts when servers are restartedunknown2008-01-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable dynamic option switch
| | * | | | Fix reorderunknown2008-01-092-4/+5
| | | | | |
| | * | | | Fix warningsunknown2008-01-091-2/+6
| | | |_|/ | | |/| |
| | * | | reset master first in test to get consistent startunknown2008-01-082-0/+4
| | | | |
| | * | | Skipp adding combinations for test tat already are skippedunknown2008-01-081-0/+3
| | | | |
| | * | | Clear ds_tmp after running "diff --help"unknown2008-01-081-1/+1
| | | | |
| | * | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-winunknown2008-01-081-3/+2
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
| | | * | Check for windows patch to convert also in --replaceunknown2008-01-081-3/+2
| | | | |
| | * | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-bug32275unknown2008-01-081-1/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr mysql-test/mysql-test-run.pl: Auto merged
| | | * | Fix spellingunknown2008-01-081-1/+1
| | | | |
| | * | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-winunknown2008-01-083-7/+10
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
| | | * | Remember dynamically set options as startedunknown2008-01-082-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/My/Options.pm: Add conversion from --set-variable=name=value to SET GLOBAL name=value
| | | * | Force restart before events_restart_phase2unknown2008-01-081-1/+1
| | | |/
| | * | Use "diif --help" to find out if diff is available at all. Otherwise theunknown2008-01-081-25/+46
| | |/ | | | | | | | | | | | | | | | | | | | | | return code from "could not find command" which is 1, conflicts with return code from diff failed, which is also 1.
| | * Remove pidfile after killing serveunknown2008-01-081-0/+7
| | |
| | * Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-vanillaunknown2008-01-080-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr mysql-test/t/mysqlbinlog_base64.test: Auto merged
| | | * Update path to master-bin fileunknown2007-12-191-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/mysqlbinlog_base64.test: Update path to master-bin file Remove non portable "exec rm"
| | * | Use a tempdir name for the directory that var symlink points at, otherwise ↵unknown2008-01-081-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it can conflict with another MTR_BUILD_THREAD=auto run
| | * | Use loose-skip-innodb so it works also with mysqld that has no innodb supportunknown2008-01-081-1/+1
| | | |
| | * | Try to dynamically change option, restart if it failsunknown2008-01-076-124/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: Try to dynamically change option, restart if it fails. mysql-test/lib/mtr_cases.pm: Try to dynamically change option, restart if it fails. mysql-test/lib/mtr_misc.pl: Move functions to My::Optiosn mysql-test/lib/mtr_report.pl: Add a small dot if test detected restart mysql-test/lib/My/Options.pm: New BitKeeper file ``mysql-test/lib/My/Options.pm'' mysql-test/lib/t/Options.t: New BitKeeper file ``mysql-test/lib/t/Options.t''
| * | | Add C version of safe_process unknown2008-01-187-14/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: Added mysql-test/lib/My/SafeProcess/my_safe_process to the ignore list configure.in: Add Makefile to build safe_process mysql-test/Makefile.am: Build lib/My/SafeProcess mysql-test/lib/My/SafeProcess.pm: Use C version of safe_process mysql-test/lib/t/SafeProcessStress.pl: Decrease number of loops mysql-test/lib/My/SafeProcess/Makefile.am: New BitKeeper file ``mysql-test/lib/My/SafeProcess/Makefile.am'' mysql-test/lib/My/SafeProcess/safe_process.cc: New BitKeeper file ``mysql-test/lib/My/SafeProcess/safe_process.cc''
| * | | Merge bk-internal:/home/bk/mysql-5.1-maint2unknown2008-01-072-1/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr mysql-test/mysql-test-run.pl: Auto merged