85b9ffc4ca
Merged from mysql-4.1 to mysql-5.0
2005-06-22 14:10:02 +02:00
ddeaf342a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-21 14:24:13 +02:00
39636f48f0
patch
2005-06-21 14:19:56 +02:00
558488d592
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-16 19:10:32 +02:00
f0caf7d58c
Merge mysql.com:/M50/clone-5.0.7 into mysql.com:/M50/mysql-5.0
2005-06-16 18:30:19 +02:00
84a04b4a9d
merge
2005-06-13 14:09:09 +02:00
00ddd2c700
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-06-10 21:31:39 +02:00
a2073df284
mtr_process.pl:
...
Added a sleep for 5 seconds when shuting down,
work around for strange problem with server restarts
mtr_cases.pl:
Set default time zone as opt to mysqld
mysql-test-run.pl:
Enabled --mysqld=<flags> to work
Put some Windows path names into environment,
to be used in --replace_result
mysql-test-run.sh:
Make shell script tolerant to Windows change in test cases
2005-06-10 21:29:37 +02:00
b41f9b36cb
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 20:23:37 +02:00
e1870b7554
mysql-test/mysql-test-run.sh
...
don't start ndb cluster if no test uses it.
2005-06-10 12:58:05 +02:00
5942498979
mysql-test-run.pl, mysql-test-run.sh:
...
Corrected path to SSL certificate files
2005-06-09 15:19:10 +02:00
161a58ab4b
merge
2005-06-06 23:39:19 +02:00
25a2c4a71e
Cleanup during review
...
Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization)
2005-06-05 17:01:20 +03:00
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
697cfe7f07
Merge from 4.1
2005-05-26 21:01:55 +02:00
0ed2e57731
Use one err file for each master
2005-05-25 11:10:10 +02:00
be861a7ccf
merge
2005-05-19 09:04:24 +02:00
3f6aad900c
Resolve merge from 4.1
2005-05-18 11:06:34 -07:00
48377eb7c4
test fixes
2005-05-18 10:57:07 +02:00
23f79bd1f2
merge
2005-05-17 10:17:53 +02:00
bd70ce726b
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-05-15 07:06:47 +02:00
221b1ccae8
mysqltest.c, mysql-test-run.sh:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
Use Purify suppress file
2005-05-15 06:59:34 +02:00
05cbb3962c
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
b72ae4fe57
Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
...
Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
Reason I don't propagate caller info to the binlog as planned is that on master and slave
users may be different; even with that some caveats would remain.
2005-05-05 14:20:53 +02:00
4f1e27ed00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-03 00:10:52 +02:00
7bab94f36b
Clean up merge from 4.1
2005-05-02 10:19:37 -07:00
518f644204
Fix 'mysql_client_test' with embedded server. (Bug #9634 )
2005-04-27 17:50:48 -07:00
3e4607a3b8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-04-26 19:07:13 -07:00
2193fd8666
All changes for change to all storage engines being under storage directory.
2005-04-26 19:04:36 -07:00
780202f130
Moved some old test and added a new test to only be run with mysql-test-run --big
...
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
2005-04-07 19:24:14 +03:00
beb28b27e0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-06 17:23:34 +03:00
49e721677f
Fixed errors descovered by valgrind 2.4
...
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03:00
8197710349
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-04-05 06:12:41 +04:00
7730319738
Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
...
doesn't work out of the box)
2005-04-04 03:49:10 +04:00
5865330a9e
Merge embedded server testing changes from 4.1.
2005-04-01 19:17:15 -08:00
16efc3e333
Merge embedded-server testing changes.
2005-04-01 16:43:35 -08:00
aa4f352230
Remove result.es files and support for them, which requires splitting
...
up a couple of tests and adjusting the output of others. Exposes two
bugs (9472 and 9508).
2005-03-30 17:32:44 -08:00
690183d1a0
Eliminate most of the remaining hardcoded list of tests to skip
...
by adding check for embedded server within tests and splitting some
tests into multiple test files.
2005-03-29 17:17:46 -08:00
bfa7520356
Clean up InnoDB testing with embedded server.
2005-03-29 16:10:43 -08:00
46eda5b998
Shift skipping of some tests with embedded server from within
...
mysql-test-run to the tests themselves.
2005-03-29 15:50:16 -08:00
c91034fea8
Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started
2005-03-29 15:15:28 +02:00
252bbe9eb9
Merge mysql.com:/home/jimw/my/mysql-5.0-5036
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-22 16:09:51 -08:00
2a53e9d9a6
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-22 15:57:20 +01:00
466d3bff25
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
2005-03-22 15:14:40 +01:00
f3d284c8bc
mysql-test-run.sh, mysql-test-run.pl:
...
InnoDB needs longer start time for second slave on slow hosts
2005-03-22 15:12:05 +01:00
348c285d0f
mysql-test-run.sh:
...
Disabled old feature to disable test cases
2005-03-18 16:48:18 +01:00
b435d6e862
Merge 4.1 -> 5.0
2005-03-17 16:51:07 +03:00
265270b970
Fix to get --skip-ndb to work
2005-03-16 15:32:43 +02:00
72e2466c0d
mysql-test-run.sh:
...
Check that there is a disabled.def before using it
disabled.def:
Reenable ndb tests accidently disabled
2005-03-16 09:23:38 +01:00
fde941e5b4
Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way
2005-03-16 01:15:45 +02:00
