1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Commit Graph

1567 Commits

Author SHA1 Message Date
unknown
7060440093 Turn off vernose for windows 2008-03-14 13:59:43 +01:00
unknown
24640ab982 Find ndb binaries
Verbose SafeProcess.pm 


mysql-test/mysql-test-run.pl:
  Cleanup how script find ndb binaries and paths
  Remove "executable_setup_failed" code, i.e either we have ndb support or we don't
  Remove ndb_extra_test, not used by any test. If there is a need for that, just 
  create a new suite
mysql-test/lib/My/Find.pm:
  Add possibility to use my_find_bin for a binary that is not required
mysql-test/lib/My/SafeProcess.pm:
  Add verbose printous that can be turned on
  Wait on process also if start_kill failed
  Turn verbose on for windows
mysql-test/lib/My/SafeProcess/safe_kill_win.cc:
  Extend sleep from 0 to 100
mysql-test/lib/mtr_cases.pm:
  Remove ndb_extra
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test:
  Extra checks should be for Last_IO_Errno
2008-03-13 17:16:42 +01:00
unknown
85577e9d2a Show which servers have been started for --start-and-exit and --start-dirty 2008-03-12 10:34:24 +01:00
unknown
bc4d3646e5 Temporarily turn on verbose on windows 2008-03-11 08:20:44 +01:00
unknown
903d8eb886 Cleanup with/skip/supported-ndbcluster 2008-03-10 16:38:28 +01:00
unknown
79bd441fd8 Use retry=3 as default 2008-03-06 17:55:16 +01:00
unknown
bf70ac3161 Removed unused "#!remove_datadir"
Cleanup BACKUP dir from clusters datadir in case of test failure
2008-03-06 10:15:01 +01:00
unknown
e32d6c83e6 Apply patch
mysql-test/mysql-test-run.pl:
  Apply patch for bug#34995
2008-03-03 12:53:57 +01:00
unknown
6153c248cf Bug#34995 mysql-test-run doesn't allow client lib/binary selection
mysql-test/mysql-test-run.pl:
  Add support for spcifying --client-libdir=s and --client-bindir=s
2008-03-03 12:47:05 +01:00
unknown
f1515a9e37 Merge 192.168.0.9:mysql/mysql-5.1-mtr
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/mysql-test-run.pl:
  Auto merged
2008-03-03 10:03:05 +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
d8d3ed3bc5 Add variables fro myisamchk and myisampack 2008-02-28 11:49:14 +01:00
unknown
125e4a450f Use car/tmp as tempdir for mysqld --bootstrap
Run "mysql --bootstrap" with verbose if turned on
2008-02-28 10:52:04 +01: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
d41af7ad4a mysql-test/mysql-test-run.pl
Disable extra team trees.
    Temporary fix for entry 34761 in the bugs DB.
    (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)


mysql-test/mysql-test-run.pl:
  Disable extra team trees.
  Temporary fix for entry 34761 in the bugs DB.
  (Patch by Magnus Svensson, 2008-02-22 17:40:14+01:00, msvensson@pilot.mysql.com +1 -0)
2008-02-22 19:15:31 +01:00
unknown
50ba314c98 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
extra/yassl/src/handshake.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged
2008-02-22 16:14:27 +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
469e71a1d0 Remove special hack for windows, log-error is already set in my.cnf file 2008-02-22 12:32:02 +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
2c9578375d correction of merge 2008-02-13 20:52:01 +01:00
unknown
cbaf350bcb fix for embedded build 2008-02-13 16:38:16 +01:00
unknown
3e7d4265fa Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/mysql-test-run.pl:
  Auto merged
sql/log_event.cc:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  manual merge
2008-02-12 11:21:05 +01:00
unknown
2944f4b01b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  janus.mylan:/usr/home/serg/Abk/mysql-maria


mysql-test/mysql-test-run.pl:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
include/my_base.h:
  merged
2008-02-11 15:33:25 +01:00
unknown
41b8615226 don't disable debug if there's nothing to disable 2008-02-06 23:08:51 +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
8d5a63f0ac Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).


mysql-test/mysql-test-run.pl:
  Fix bad merge (remove duplicate code adding --user=root arg)
2008-02-05 23:20:12 -07:00
unknown
40f2a6ae99 Minor typo fix for mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  Fix typo (missing $prefix arg to mtr_add_arg(--user=root))
2008-02-05 23:16:52 -07:00
unknown
6cb9dfed6f Removing duplicate code from mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  Removing duplicate code.
2008-02-06 06:18:06 +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
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
a36faa7eda Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


client/client_priv.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_invoked_features.result:
  Manual merge.
mysql-test/suite/rpl/t/rpl_invoked_features.test:
  Manual merge.
sql/log.cc:
  Manual merge.
2008-01-31 17:46:50 +01:00
unknown
0b23944f51 Make "./mtr --start" exit if any child process dies 2008-01-18 22:30:38 +01:00
unknown
403ef78b7c Remove duplcate code after merge 2008-01-18 16:48:08 +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
359303d9ec Allow start-from to also filter on suitename 2008-01-11 10:44:16 +01:00
unknown
266fde77b2 Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work
Allow one to run bootstrap even if --skip-maria is used (needed for bootstrap.test)
Fixed lots of compiler warnings

NOTE:
maria-big and maria-recover tests failes becasue of bugs in transaction log handling.
Sanja knows about this and is working on it!


mysql-test/mysql-test-run.pl:
  Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to work
mysql-test/r/maria-recovery.result:
  Updated results
mysql-test/t/bootstrap.test:
  Removed not needed empty line
mysql-test/t/change_user.test:
  Fixed results for 32 bit systems
mysql-test/t/maria-big.test:
  Only run this when you use --big
mysql-test/t/maria-recovery.test:
  Added test case for recovery with big blobs
mysys/my_uuid.c:
  Fixed compiler warning
sql/mysqld.cc:
  Allow one to run bootstrap even if --skip-maria is used (needed for bootstrap.test)
sql/set_var.cc:
  Compare max_join_size with ULONG_MAX instead of HA_POS_ERROR as we set max_join_size to ULONG_MAX by default
storage/maria/ma_bitmap.c:
  Added __attribute((unused)) to fix compiler warning
storage/maria/ma_blockrec.c:
  Added casts to remove compiler warnings
  Change variable types to avoid compiler warnings
storage/maria/ma_check.c:
  Added casts to remove compiler warnings
storage/maria/ma_checkpoint.c:
  Change variable types to avoid compiler warnings
storage/maria/ma_create.c:
  Change variable types to avoid compiler warnings
storage/maria/ma_delete.c:
  Added casts to remove compiler warnings
storage/maria/ma_key_recover.c:
  Added casts to remove compiler warnings
storage/maria/ma_loghandler.c:
  Moved initiazation of prev_buffer first as this could otherwise not be set in case of errors
storage/maria/ma_page.c:
  Added casts to remove compiler warnings
storage/maria/ma_pagecache.c:
  Added __attribute((unused)) to fix compiler warning
storage/maria/ma_pagecrc.c:
  Added #ifndef DBUG_OFF to remove compiler warning
storage/maria/ma_recovery.c:
  Added casts to remove compiler warnings
storage/maria/ma_write.c:
  Added casts to remove compiler warnings
storage/maria/maria_chk.c:
  Split long string into two to avoid compiler warnings
storage/myisam/ft_boolean_search.c:
  Added LINT_INIT() to remove compiler warning
support-files/compiler_warnings.supp:
  Suppress wrong compiler warning
unittest/mytap/tap.c:
  Fixed declaration to match prototypes to remove compiler warnings
2008-01-11 01:47:52 +02:00
unknown
27f7fc8dde Fix misspelled variable name 2008-01-10 16:38:59 +01:00
unknown
2dd6e40f77 Add --repeat and --retry 2008-01-10 10:44:18 +01:00
unknown
b6ea81a4c0 Add printouts when servers are restarted
Disable dynamic option switch
2008-01-09 13:47:09 +01:00
unknown
85ba3d96c8 Fix reorder 2008-01-09 11:15:59 +01:00
unknown
f2c4c8dd26 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-bug32275
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/mysql-test-run.pl:
  Auto merged
2008-01-08 15:49:28 +01:00
unknown
003c55d95e Fix spelling 2008-01-08 15:48: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
unknown
1292c6f6a3 Remove pidfile after killing serve 2008-01-08 11:11:06 +01:00
unknown
2b58c0073f Use a tempdir name for the directory that var symlink points at, otherwise it can conflict
with another MTR_BUILD_THREAD=auto run
2008-01-08 10:50:07 +01:00
unknown
919fed54d0 Try to dynamically change option, restart if it fails
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''
2008-01-07 19:44:48 +01:00
unknown
bd172e5044 Merge bk-internal:/home/bk/mysql-5.1-maint2
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr


mysql-test/mysql-test-run.pl:
  Auto merged
2008-01-07 15:40:54 +01:00