database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-06 05:42:06 +03:00
Code Activity
178,730 Commits 3,311 Branches 1,099 Tags
550c8bdb81fd31b95df4424acabb0d2224f94e24
Commit Graph

3866 Commits

Author SHA1 Message Date
unknown
69e54f84ec Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
 2006-04-10 17:48:17 -07:00
igor@rurik.mysql.com
0f2a1f0db8 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-04-10 17:48:17 -07:00
unknown
69cf432673 Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix 
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp


mysql-test/mysql-test-run.pl:
  Manual merge
 2006-04-10 17:58:21 +02:00
knielsen@mysql.com
1f9d96430d Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix 
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp
 2006-04-10 17:58:21 +02:00
unknown
ff343a415e mysql-test-run.pl: 
Added --ndbcluster_port for backward compatibility
make_win_src_distribution.sh:
  Updated to reflect 5.1 changes


scripts/make_win_src_distribution.sh:
  Updated to reflect 5.1 changes
mysql-test/mysql-test-run.pl:
  Added --ndbcluster_port for backward compatibility
 2006-04-10 14:15:02 +02:00
kent@mysql.com
41923d3bb1 mysql-test-run.pl: 
Added --ndbcluster_port for backward compatibility
make_win_src_distribution.sh:
  Updated to reflect 5.1 changes
 2006-04-10 14:15:02 +02:00
unknown
5a19f3bc71 $MYSQL_TEST was broken with --valgrind. 2006-04-08 22:27:43 +02:00
knielsen@mysql.com
4d5ab7a961 $MYSQL_TEST was broken with --valgrind. 2006-04-08 22:27:43 +02:00
unknown
4c7c097241 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release


libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
 2006-04-08 04:29:17 +02:00
kent@mysql.com
f957d8e282 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-08 04:29:17 +02:00
unknown
1ba7235e10 Manual merge. 
mysql-test/mysql-test-run.pl:
  Manual merge (no idea why automatic merge failed ...).
 2006-04-07 13:44:43 +02:00
joerg@mysql.com
945599f3cf Manual merge. 2006-04-07 13:44:43 +02:00
unknown
7bb1882822 mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored). 
mysql-test/mysql-test-run.pl:
  Add option "with-ndbcluster-only" (ignored) for compatibility with newer "Do-compile".
 2006-04-07 13:34:39 +02:00
joerg@mysql.com
65f4595e9a mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored). 2006-04-07 13:34:39 +02:00
unknown
84c13fdf92 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
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
storage/csv/ha_tina.h:
  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
storage/csv/ha_tina.cc:
  SCCS merged
 2006-04-06 11:38:50 +02:00
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