1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-10 02:01:19 +03:00

1144 Commits

Author SHA1 Message Date
unknown
055d5da858 New Makefile.am for mysql-test makes it pass also "make distcheck" and "make install"
mysql-test/lib/My/SafeProcess/Makefile.am:
  Update Makefile.am to dist all relevant files
2008-03-13 17:07:11 +01:00
unknown
a4ee24e368 Also copy [mysqld] section to [embedded]
mysql-test/include/default_mysqld.cnf:
  Use --slave-net-timeout instead of --set-variable=slave_net_timeout
2008-03-12 12:35:30 +01:00
unknown
7d336347d5 Improve process kill on windows
mysql-test/lib/My/SafeProcess.pm:
  Ifnore Ctrl-C in timer process
  Don't wait blocking for a preoces where start_kill fails
  Rewrite sart_kill to return 0 for error and > 1 for sucess
mysql-test/lib/My/SafeProcess/safe_process_win.cc:
  Add missing fflush(stderr) in 'die'
2008-03-12 11:32:18 +01:00
unknown
d6df18dd33 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  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/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
2008-03-12 11:19:46 +03:00
unknown
27c7181d98 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-win
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged
2008-03-10 16:42:04 +01:00
unknown
18c62e62ed Mark test that includes "ndb_master-slave.inc" as ndb_test 2008-03-10 16:40:19 +01:00
unknown
91df8771c3 Improve error message dir -> croak 2008-03-10 16:37:37 +01:00
unknown
351092d81f Ignore all common signals
Just retry OpenEvent a couple of times with a "yield" in between
2008-03-10 16:00:39 +01:00
unknown
551ab51c91 Print args in case requirement fails 2008-03-10 14:09:59 +01:00
unknown
8d738693c0 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-win
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-03-10 12:55:25 +01:00
unknown
4aced3b84d Add retry logic for OpenEvent to avoid problems when the
process to kill hasn't yet created the event
2008-03-10 12:54:46 +01:00
unknown
f1ca85404b Look for sourced file relative to test first 2008-03-10 12:53:35 +01:00
unknown
a55bb29e37 Improve error messages 2008-03-06 10:19:41 +01:00
unknown
adeac5cabe Adding code to ignore warning from error log.
mysql-test/lib/mtr_report.pl:
  Filtering out benign warning that can be generated during server shutdown.
2008-03-04 13:21:15 +01:00
unknown
1c660c9c81 Don't ignore SIGCHLD since that affects waitpid on some platforms
Fix spelling error
Move exit_code into local scope
2008-03-04 12:32:51 +01:00
unknown
5435b66b91 Fix after merge
mysql-test/extra/rpl_tests/rpl_charset.test:
  Fix merge error
mysql-test/lib/mtr_report.pm:
  Move the . out of [] to avoid log file parsing errors
mysql-test/mysql-test-run.pl:
  Correct spelling of option
sql/ha_ndbcluster_binlog.cc:
  Fix merge error(used "Use remote")
2008-02-28 18:55:46 +01:00
unknown
3320c165cf Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
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
2008-02-28 12:21:44 +01:00
unknown
bfbea4f4b4 Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel


BitKeeper/etc/ignore:
  auto-union
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
sql/mysqld.cc:
  Manual merge with main 5.1 tree.
2008-02-27 16:46:32 +02:00
unknown
78100d80ea Only uise one file for current test
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
2008-02-25 16:41:59 +01:00
unknown
47fa7fd24b Fix embedded server
mysql-test/lib/My/ConfigFactory.pm:
  Generate [embedded] section
mysql-test/mysql-test-run.pl:
  Fix embedded server support
2008-02-22 15:38:10 +01:00
unknown
11805bec02 Convert to mixed_path under cywin, not native_path 2008-02-22 12:23:46 +01:00
unknown
5408421019 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


sql/handler.cc:
  Auto merged
2008-02-20 19:27:06 +01:00
unknown
0d01221c17 Use My::Platform
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''
2008-02-20 14:55:30 +01:00
unknown
5d1e8e12c3 Removing deliberately generated errors for rpl_bug33931 test
and moving test to replication suite.


mysql-test/suite/rpl/t/rpl_bug33931-slave.opt:
  Rename: mysql-test/t/rpl_bug33931-slave.opt -> mysql-test/suite/rpl/t/rpl_bug33931-slave.opt
mysql-test/suite/rpl/t/rpl_bug33931.test:
  Rename: mysql-test/t/rpl_bug33931.test -> mysql-test/suite/rpl/t/rpl_bug33931.test
mysql-test/suite/rpl/r/rpl_bug33931.result:
  Rename: mysql-test/r/rpl_bug33931.result -> mysql-test/suite/rpl/r/rpl_bug33931.result
mysql-test/lib/mtr_report.pl:
  Removing deliberately generated errors for rpl_bug33931 test.
2008-02-19 19:59:48 +01:00
unknown
695865fee9 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
BitKeeper/deleted/.del-rpl_ndb_charset.result:
  Auto merged
BitKeeper/deleted/.del-rpl_row_charset.result:
  Auto merged
BitKeeper/deleted/.del-rpl_row_charset.test:
  Auto merged
BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
2008-02-17 14:57:01 +03:00
unknown
d740f5c675 Post-merge fix after merging the patch for bug#31590 to 5.1:
suppress the "Out of sort memory" error in the error log.
2008-02-14 16:33:11 +03:00
unknown
58753e5c11 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel


BitKeeper/etc/ignore:
  auto-union
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/m_string.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_dbug.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  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_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.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
sql/unireg.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
client/mysqlslap.c:
  Manual merge with main 5.1 tree.
2008-02-08 12:13:33 +01:00
unknown
7b59b82f8f after-merge
*correct* disabling of dbug in mysql-test-run


include/atomic/gcc_builtins.h:
  after-merge
mysql-test/lib/mtr_report.pl:
  after-merge
mysql-test/mysql-test-run.pl:
  *correct* disabling of dbug in mysql-test-run
mysql-test/r/ps_maria.result:
  after-merge
mysql-test/t/crash_commit_before-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-big-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-bitmap-master.opt:
  *correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-master.opt:
  *correct* disabling of dbug in mysql-test-run
sql/mysqld.cc:
  --disable-debug
2008-02-06 17:55:04 +01:00
unknown
263b4ff3de Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged
sql/log_event.cc:
  Auto merged
2008-02-06 16:16:49 +01:00
unknown
2e6a7416cd Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1
into  janus.mylan:/usr/home/serg/Abk/mysql-maria


include/my_sys.h:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_insert.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
sql/log_event_old.h:
  SCCS merged
BitKeeper/triggers/post-commit:
  merged
client/mysqldump.c:
  merged
configure.in:
  merged
client/mysqltest.c:
  merged
include/Makefile.am:
  merged
include/atomic/nolock.h:
  merged
mysql-test/lib/mtr_report.pl:
  merged
sql/handler.h:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged
2008-02-05 16:47:11 +01:00
unknown
df2cf8c78d Adding some more filtering for tests that kills queries and
cause sporadic, but benign, errors.


mysql-test/lib/mtr_report.pl:
  Filtering out sporadic but benign error in rpl_err_ignoredtable.
2008-02-05 13:31:57 +01:00
unknown
57c599b3d4 Disabling test case binlog_old_version for embedded server.
mysql-test/lib/mtr_report.pl:
  Ignoring benign error message (killing query causes unpredictable
  error messages).
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Disabling test case for embedded server.
sql/rpl_rli.cc:
  Inititializing uninitialized variable causing valgrind warning.
2008-02-05 08:22:27 +01:00
unknown
211e5e4658 Make mtr_report.pl into it's own package
Remove mtr_log_*


BitKeeper/deleted/.del-mtr_settings.pl:
  Delete: mysql-test/lib/mtr_settings.pl
2008-02-04 11:16:25 +01:00
unknown
7b29399e02 Merge bk-internal:/home/bk/mysql-5.1-maint2
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
2008-02-04 09:16:37 +01:00
unknown
136e285055 Add --verbose-restart
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
2008-02-04 09:15:44 +01:00
unknown
2bccc0e600 Masking out some more errors and warnings that are benign.
mysql-test/include/delete_anonymous_users.inc:
  Disabling warnings.
mysql-test/lib/mtr_report.pl:
  Masking out benign errors and warnings from var/log/warnings file.
2008-02-04 07:15:14 +01:00
unknown
eca6968963 Removing expected errors from slave from the warnings file.
mysql-test/lib/mtr_report.pl:
  Removing some expected warnings and errors from the slave for
  tests rpl_idempotency and rpl_skip_error.
2008-02-03 18:43:05 +01:00
unknown
600d406283 Merge bk-internal:/home/bk/mysql-5.1-maint2
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
2008-01-18 00:06:30 +01:00
unknown
02a784efea Add C version of safe_process
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''
2008-01-18 00:03:38 +01:00
unknown
534417c285 WL#3072 - Maria Recovery
Bulk insert: don't log REDO/UNDO for rows, log one UNDO which will
truncate files; this is an optimization and a bugfix (table was left
half-repaired by crash).
Repair: mark table crashed-on-repair at start, bump skip_redo_lsn at start,
this is easier for recovery (tells it to skip old REDOs or even UNDO
phase) and user (tells it to repair) in case of crash, sync files
in the end.
Recovery skips missing or corrupted table and moves to next record
(in REDO or UNDO phase) to be more robust; warns if happens in UNDO phase.
Bugfix for UNDO_KEY_DELETE_WITH_ROOT (tested in ma_test_recovery)
and maria_enable_indexes().
Create missing bitmaps when needed (there can be more than one to create,
in rare cases), log a record for this.


include/myisamchk.h:
  new flag: bulk insert repair mustn't bump create_rename_lsn
mysql-test/lib/mtr_report.pl:
  skip normal warning in maria-recovery.test
mysql-test/r/maria-recovery.result:
  result: crash before bulk insert is committed, causes proper rollback,
  and crash right after OPTIMIZE replaces index file with new index file
  leads to table marked corrupted and recovery not failing.
mysql-test/t/maria-recovery.test:
  - can't check the table or it would commit the transaction,
  but check is made after recovery.
  - test of crash before bulk-insert-with-repair is committed
  (to see if it is rolled back), and of crash after OPTIMIZE has replaced
  index file but not finished all operations (to see if recovery fails -
  it used to assert when trying to execute an old REDO on the new
  index).
storage/maria/CMakeLists.txt:
  new file
storage/maria/Makefile.am:
  new file
storage/maria/ha_maria.cc:
  - If bulk insert on a transactional table using an index repair:
  table is initially empty, so don't log REDO/UNDO for data rows
  (optimization), just log an UNDO_BULK_INSERT_WITH_REPAIR
  which will, if executed, empty the data and index file. Re-enable
  logging in end_bulk_insert().
  - write log record for repair operation only after it's fully done,
  index sort including (maria_repair*() used to write the log record).
  - Adding back file->trn=NULL which was removed by mistake earlier.
storage/maria/ha_maria.h:
  new member (see ha_maria.cc)
storage/maria/ma_bitmap.c:
  Functions to create missing bitmaps:
  - one function which creates missing bitmaps in page cache, except
  the missing one with max offset which it does not put into page cache
  as it will be modified very soon.
  - one function which the one above calls, and creates bitmaps in page
  cache
  - one function to execute REDO_BITMAP_NEW_PAGE which uses the second
  one above.
storage/maria/ma_blockrec.c:
  - when logging REDO_DELETE_ALL, not only 'records' and 'checksum'
  has to be reset under log's mutex.
  - execution of REDO_INSERT_ROW_BLOBS now checks the dirty pages' list
  - execution of UNDO_BULK_INSERT_WITH_REPAIR
storage/maria/ma_blockrec.h:
  new functions
storage/maria/ma_check.c:
  - table-flush-before-repair is moved to a separate function reused
  by maria_sort_index(); syncing is added
  - maria_repair() is allowed to re-enable logging only if it is the one
  which disabled it.
  - "_ma_flush_table_files_after_repair" was a bad name, it's not after
  repair now, and it should not sync as we do more changes to the files
  shortly after (sync is postponed to when writing the log record)
  - REDO_REPAIR record should be written only after all repair
  operations (in particular after sorting index in ha_mara::repair())
  - close to the end of repair by sort, flushing of pages must happen
  also in the non-quick case, to prepare for the sync at end.
  - in parallel repair, some page flushes are not needed as done
  by initialize_variables_for_repair().
storage/maria/ma_create.c:
  Update skip_redo_lsn, create_rename_lsn optionally.
storage/maria/ma_delete_all.c:
  Need to sync files at end of maria_delete_all_rows(), if transactional.
storage/maria/ma_extra.c:
  During repair, we sometimes call _ma_flush_table_files() (via
  _ma_flush_table_files_before_swap()) while there is a WRITE_CACHE.
storage/maria/ma_key_recover.c:
  - when we see CLR_END for UNDO_BULK_INSERT_WITH_REPAIR, re-enable
  indices.
  - fixing bug: _ma_apply_undo_key_delete() parsed UNDO_KEY_DELETE_WITH_ROOT
  wrongly, leading to recovery failure
storage/maria/ma_key_recover.h:
  new prototype
storage/maria/ma_locking.c:
  DBUG_VOID_RETURN missing
storage/maria/ma_loghandler.c:
  UNDO for bulk insert with repair, and REDO for creating bitmaps.
  LOGREC_FIRST_FREE to not have to change the for() every time we
  add a new record type.
storage/maria/ma_loghandler.h:
  new UNDO and REDO
storage/maria/ma_open.c:
  Move share.kfile.file=kfile up a bit, so that _ma_update_state_lsns()
  can get its value, this fixes a bug where LSN_REPAIRED_BY_MARIA_CHK
  was not corrected on disk by maria_open().
  Store skip_redo_lsn in index' header.
  maria_enable_indexes() had a bug for BLOCK_RECORD, where an empty
  file has one page, not 0 bytes.
storage/maria/ma_recovery.c:
  - Skip a corrupted, missing, or repaired-with-maria_chk, table in
  recovery: don't fail, just go to next REDO or UNDO; but if an UNDO
  is skipped in UNDO phase we issue warnings.
  - Skip REDO|UNDO in REDO phase if <skip_redo_lsn.
  - If UNDO phase fails, delete transactions to not make trnman
  assert.
  - Update skip_redo_lsn when playing REDO_CREATE_TABLE
  - Don't record UNDOs for old transactions which we don't know (long_trid==0)
  - Bugfix for UNDO_KEY_DELETE_WITH_ROOT (see ma_key_recover.c)
  - Execution of UNDO_BULK_INSERT_WITH_REPAIR
  - Don't try to find a page number in REDO_DELETE_ALL
  - Pieces moved to ma_recovery_util.c
storage/maria/ma_rename.c:
  name change
storage/maria/ma_static.c:
  I modified layout of the index' header (inserted skip_redo_lsn in its middle)
storage/maria/ma_test2.c:
  allow breaking the test towards the end, tests execution of
  UNDO_KEY_DELETE_WITH_ROOT
storage/maria/ma_test_recovery.expected:
  6 as testflag instead of 4
storage/maria/ma_test_recovery:
  Increase the amount of rollback work to do when testing recovery
  with ma_test2; this reproduces the UNDO_KEY_DELETE_WITH_ROOT bug.
storage/maria/maria_chk.c:
  skip_redo_lsn should be updated too, for consistency.
  Write a REDO_REPAIR after all operations (including sort-records)
  have been done.
  No reason to flush blocks after maria_chk_data_link() and
  maria_sort_records(), there is maria_close() in the end.
  write_log_record() is a function, to not clutter maria_chk().
storage/maria/maria_def.h:
  New member skip_redo_lsn in the state, and comments
storage/maria/maria_pack.c:
  skip_redo_lsn should be updated too, for consistency
storage/maria/ma_recovery_util.c:
  _ma_redo_not_needed_for_page(), defined in ma_recovery.c, is needed
  by ma_blockrec.c; this causes link issues, resolved by putting
  _ma_redo_not_needed_for_page() into a new file (so that it is not
  in the same file as repair-related objects of ma_recovery.c).
storage/maria/ma_recovery_util.h:
  new file
2008-01-17 23:59:32 +01:00
unknown
359303d9ec Allow start-from to also filter on suitename 2008-01-11 10:44:16 +01:00
unknown
0a69b0b833 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-parts
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged
2008-01-10 17:17:04 +01:00
unknown
c6a1ed022c - Add autodetection of which my.cnfs to use for each testcase if suite does
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
2008-01-10 16:50:37 +01:00
unknown
25689b4888 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-win
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/My/SafeProcess.pm:
  Auto merged
2008-01-10 12:15:51 +01:00
unknown
d94ec26792 Auto kill any children before exiting from process 2008-01-10 12:00:56 +01:00
unknown
2dd6e40f77 Add --repeat and --retry 2008-01-10 10:44:18 +01:00
unknown
af59a3aaaa Fix bug where local variable masked outer variable 2008-01-09 16:10:25 +01:00
unknown
85ba3d96c8 Fix reorder 2008-01-09 11:15:59 +01:00
unknown
a216016255 Skipp adding combinations for test tat already are skipped 2008-01-08 21:26:55 +01:00
unknown
7741bde603 Remember dynamically set options as started
mysql-test/lib/My/Options.pm:
  Add conversion from --set-variable=name=value to SET GLOBAL name=value
2008-01-08 15:47:04 +01:00