1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Commit Graph

3901 Commits

Author SHA1 Message Date
msvensson@shellback.(none)
e1348410d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-06 11:38:50 +02:00
unknown
0e97b724b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2006-04-05 10:08:38 +02:00
msvensson@shellback.(none)
b0c6455908 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-05 10:08:38 +02:00
unknown
af66d20c8e Merge
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
2006-04-04 20:25:23 +02:00
joerg@mysql.com
d99d4d9bb1 Merge 2006-04-04 20:25:23 +02:00
unknown
90c926d99a Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2006-04-04 09:51:06 +02:00
msvensson@shellback.(none)
d387211106 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-04-04 09:51:06 +02:00
unknown
a1c46189b8 Add option --debugger=NAME and --client-debugger=NAME.
Add support for "--debugger=windbg" and "--debugger=vcexpress"
2006-04-04 09:49:32 +02:00
msvensson@shellback.(none)
d4c7943891 Add option --debugger=NAME and --client-debugger=NAME.
Add support for "--debugger=windbg" and "--debugger=vcexpress"
2006-04-04 09:49:32 +02:00
unknown
1658694741 Merge
scripts/mysqld_safe.sh:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
2006-03-31 15:26:51 +02:00
kent@mysql.com
2727df012d Merge 2006-03-31 15:26:51 +02:00
unknown
66ac19e2cf Merge
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
2006-03-30 06:48:40 +02:00
kent@mysql.com
ae532e2611 Merge 2006-03-30 06:48:40 +02:00
unknown
3479ec3780 mysql-test-run.pl:
Check that port range is valid, bug#16807


mysql-test/mysql-test-run.pl:
  Check that port range is valid, bug#16807
2006-03-30 00:48:46 +02:00
kent@mysql.com
1f5ac05df0 mysql-test-run.pl:
Check that port range is valid, bug#16807
2006-03-30 00:48:46 +02:00
unknown
734eda5f25 Manual merge
mysql-test/mysql-test-run.pl:
  Merge
sql/mysqld.cc:
  Merge
2006-03-29 12:09:37 +02:00
msvensson@shellback.
14e30f4773 Manual merge 2006-03-29 12:09:37 +02:00
unknown
7c1c4c7167 Move "start-from" into section "Control what tests to run" 2006-03-29 09:59:16 +02:00
msvensson@shellback.
2da3f0e00a Move "start-from" into section "Control what tests to run" 2006-03-29 09:59:16 +02:00
unknown
29ca093e60 Use default value variable when printing out the default timeouts 2006-03-29 09:39:18 +02:00
msvensson@shellback.
d9b243c635 Use default value variable when printing out the default timeouts 2006-03-29 09:39:18 +02:00
unknown
1ae58ddfa4 Remove "restart-cleanup" not needed any more as a snapshot of the db will be restored after a failed test case 2006-03-29 09:30:07 +02:00
msvensson@shellback.
3e73f1d073 Remove "restart-cleanup" not needed any more as a snapshot of the db will be restored after a failed test case 2006-03-29 09:30:07 +02:00
unknown
5eef76cfed "ndbcluster_port" => "ndbcluster-port"
"ndbcluster_port_slave" => "ndbcluster-port-slave"
2006-03-29 09:15:29 +02:00
msvensson@shellback.
e803ceccb2 "ndbcluster_port" => "ndbcluster-port"
"ndbcluster_port_slave" => "ndbcluster-port-slave"
2006-03-29 09:15:29 +02:00
unknown
c603c5acc4 "ndbconnectstring" => "ndb-connectstring" 2006-03-29 09:00:48 +02:00
msvensson@shellback.
085a310a01 "ndbconnectstring" => "ndb-connectstring" 2006-03-29 09:00:48 +02:00
unknown
9d682d54d9 Add comments for "--big-test" aka "--big" and move it to the section "Control what tests to run" 2006-03-29 08:55:29 +02:00
msvensson@shellback.
b1bc41e703 Add comments for "--big-test" aka "--big" and move it to the section "Control what tests to run" 2006-03-29 08:55:29 +02:00
unknown
bc609ffbd0 Add new paths where to look for mysql_client_test 2006-03-28 19:32:50 +02:00
msvensson@shellback.
21001c6df1 Add new paths where to look for mysql_client_test 2006-03-28 19:32:50 +02:00
unknown
fa780d44c6 Manual merge.
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-03-28 10:07:03 +02:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
unknown
421ae80b0c mysql_fix_privilege_tables is not available (nor needed) in a Windows CMake
build, so do not require it to be present in mysql-test-run.pl.
2006-03-27 21:44:29 +02:00
knielsen@mysql.com
459050636c mysql_fix_privilege_tables is not available (nor needed) in a Windows CMake
build, so do not require it to be present in mysql-test-run.pl.
2006-03-27 21:44:29 +02:00
unknown
2919dceb72 make_binary_distribution.sh:
Split cp operations, to avoid shell limit on number of args
mysql-test-run.pl:
  Removed obsolete way of cleaning up after test failure
.del-drop-on-restart.inc~ef1715ddbebc3102:
  Delete: mysql-test/include/drop-on-restart.inc


BitKeeper/deleted/.del-drop-on-restart.inc~ef1715ddbebc3102:
  Delete: mysql-test/include/drop-on-restart.inc
mysql-test/mysql-test-run.pl:
  Removed obsolete way of cleaning up after test failure
scripts/make_binary_distribution.sh:
  Split cp operations, to avoid shell limit on number of args
2006-03-27 06:44:45 +02:00
kent@mysql.com
5ff0851d4e make_binary_distribution.sh:
Split cp operations, to avoid shell limit on number of args
mysql-test-run.pl:
  Removed obsolete way of cleaning up after test failure
.del-drop-on-restart.inc~ef1715ddbebc3102:
  Delete: mysql-test/include/drop-on-restart.inc
2006-03-27 06:44:45 +02:00
unknown
e65c4d2297 Merge 192.168.0.100:mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2006-03-24 12:33:11 +01:00
msvensson@neptunus.(none)
ab1f95df3e Merge 192.168.0.100:mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 12:33:11 +01:00
unknown
cdbd13a2ea Fix mysql-test-run.pl so that mysql_client_test works in a CMake build tree.
mysql-test/mysql-test-run.pl:
  Also look for the mysql_test_run binary in the places where it is put
  by CMake builds.
2006-03-24 11:49:11 +01:00
knielsen@mysql.com
87a9d85ea1 Fix mysql-test-run.pl so that mysql_client_test works in a CMake build tree. 2006-03-24 11:49:11 +01:00
unknown
e1da710d5b Only run in libtool if running in valgrind.
Apparently libtool isn't properly setup on all our build hosts.


mysql-test/mysql-test-run.pl:
  Only run in libtool if running in valgrind.
2006-03-23 22:29:53 +01:00
msvensson@shellback.(none)
7162b65c24 Only run in libtool if running in valgrind.
Apparently libtool isn't properly setup on all our build hosts.
2006-03-23 22:29:53 +01:00
unknown
d19fe3871a Delete gdbinit file before writing to it
Concat type+idx to get a unique gdbinit filename
2006-03-23 20:05:09 +01:00
msvensson@shellback.(none)
948cecf477 Delete gdbinit file before writing to it
Concat type+idx to get a unique gdbinit filename
2006-03-23 20:05:09 +01:00
unknown
52c4dbd88b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
4602e426dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:58:53 +01:00
unknown
ae2e4edd05 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
sql/sql_error.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged
2006-03-23 18:14:02 +01:00
msvensson@shellback.(none)
b5bea5e312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
2006-03-23 18:14:02 +01:00
unknown
4688ccf099 Remove unused option "verbose" 2006-03-23 16:41:29 +01:00