- 19 Oct, 2006 1 commit
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/t/create.test: Auto merged mysql-test/t/lock_multi.test: Auto merged mysql-test/t/view.test: Auto merged mysql-test/include/mix1.inc: Merge 5.0 -> 5.1 mysql-test/r/create.result: Merge 5.0 -> 5.1 mysql-test/r/innodb_mysql.result: Merge 5.0 -> 5.1 mysql-test/t/sp.test: Merge 5.0 -> 5.1
-
- 18 Oct, 2006 26 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/r/innodb_mysql.result: Auto merged mysql-test/t/innodb_mysql.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/r/create.result: Merge mysql-test/t/create.test: Merge mysql-test/t/view.test: Remove the disable_warnings part as engine=innodb has been removed
-
unknown authored
Change the ssl related variables to loose so they work also when the server is compiled without ssl
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint tests/mysql_client_test.c: Auto merged mysql-test/r/show_check.result: Merge 5.0->5.1
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint tests/mysql_client_test.c: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint tests/mysql_client_test.c: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039 sql/sql_union.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
mysql-test/r/show_check.result: Remove extra whitespace
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint vio/viossl.c: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/ps.test: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_report.pl: Auto merged
-
unknown authored
into thinking the escaped % + w was a format specifier
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
-
unknown authored
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_timer.pl: Auto merged
-
unknown authored
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
Improve code that detects if ndb shuold be installed Remove call to stop_all_servers after install db, if any servers are still running and need to be stopped they will be stopped atuomatically mysql-test/lib/mtr_cases.pl: All tests that have "source include/have_ndb.inc" are ndb tests mysql-test/mysql-test-run.pl: Set --with-ndbcluster to only be valid together with --bench Rename opt_ndbcluster_supported to glob_ndbcluster_supported it's not an option Fix warnings
-
- 17 Oct, 2006 13 commits
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint mysql-test/r/ps.result: Auto merged
-
unknown authored
mysql-test/r/func_time.result: One update from errmsg.txt and removal of /two/ duplicate results. mysql-test/t/func_time.test: Removed duplicate test.
-
unknown authored
mysql-test/r/ps.result: Update test results to account for new ps-master.opt settings mysql-test/r/show_check.result: Update test results to account for new show_check-master.opt settings
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016 sql/sql_parse.cc: Auto merged
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/deleted/.del-collapsed: auto-union BitKeeper/etc/collapsed: auto-union Makefile.am: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged include/my_dbug.h: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/csv.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/mysql.test: Auto merged netware/BUILD/compile-netware-END: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_view.h: Auto merged sql-common/my_time.c: Auto merged sql/time.cc: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged mysql-test/include/mix1.inc: Manual merge. mysql-test/r/func_time.result: Manual merge. mysql-test/r/innodb_mysql.result: Manual merge. mysql-test/t/func_time.test: Manual merge. mysql-test/t/view.test: Manual merge. sql/sql_view.cc: Manual merge.
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/etc/collapsed: auto-union BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged include/m_ctype.h: Auto merged include/my_global.h: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/binlog_row_mix_innodb_myisam.result: Auto merged mysql-test/r/csv.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/partition.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/csv.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/partition.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/field.cc: Auto merged sql/filesort.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged vio/viosocket.c: Auto merged
-
unknown authored
Remove table engine qualification where it's unnecessary. mysql-test/r/view.result: Remove requirement for innodb where not needed. (Running this test alone raised warnings that it was using myisam.) mysql-test/t/view.test: Remove requirement for innodb where not needed. (Running this test alone raised warnings that it was using myisam.) sql/sql_parse.cc: Fix previous bad re-patch. sql/sql_view.cc: Fix previous bad re-patch.
-
unknown authored
into naruto.:C:/cpp/mysql-5.1-new-maint
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_report.pl: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into naruto.:C:/cpp/mysql-5.0-maint
-
unknown authored
into naruto.:C:/cpp/bug23010/my51-bug23010 mysys/my_seek.c: Auto merged
-
unknown authored
Set comment properly before calling mtr_report_test failed and report_failure_restart mysql-test/lib/mtr_report.pl: Remove warnings No need to check ndb installed ok here, when that is detected comment is set to indicate the problem
-
unknown authored
When calculating what features to use for _this_ test run, don't look at test that already are deterined to be skipped
-