cmiller@zippy.cornsilk.net
784dff6da3
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909
2007-07-19 15:34:40 -04:00
cmiller@zippy.cornsilk.net
832fd24c41
Bug#26909: Specified key was too long; max key length is 255 bytes \
...
when creating table
Federated tables had an artificially low maximum of key length,
because the handler failed to implement a method to return it and
the default value is taked from the prototype handler.
Now, implement that method and return the maximum possible key
length, which is that of InnoDB.
2007-07-18 14:03:58 -04:00
tsmith@maint1.mysql.com
764a7a911c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-22 11:30:17 +02:00
tsmith@maint1.mysql.com
5b13cc5a30
binlog_innodb.result:
...
post-merge fix
2007-06-22 11:22:29 +02:00
dkatz@damien-katzs-computer.local
0d84133a4c
Merge damien-katzs-computer.local:/Users/dkatz/50_kill
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-06-21 22:08:14 -04:00
dkatz@damien-katzs-computer.local
a393b215fb
Bug #29138 'kill' fails in pushbuild
...
The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.
Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.
2007-06-21 21:39:52 -04:00
tsmith@maint1.mysql.com
8a946f5596
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-22 01:43:57 +02:00
tsmith@maint1.mysql.com
28242f775c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-21 22:10:40 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
5847f02846
Disabled new test cases that are not 100% stable yet
2007-06-21 22:07:21 +02:00
tsmith@maint1.mysql.com
8ee2c2b04e
Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-21 20:55:37 +02:00
tsmith@maint1.mysql.com
b8881ebfd4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-21 20:09:04 +02:00
tsmith@maint1.mysql.com
3ae37d30de
Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-21 18:58:31 +02:00
iggy@amd64.(none)
08cb616544
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into amd64.(none):/src/bug27029/my51-bug27029
2007-06-21 12:53:03 -04:00
iggy@amd64.(none)
1378e94aa0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into amd64.(none):/src/bug27029/my50-bug27029
2007-06-21 12:52:20 -04:00
iggy@amd64.(none)
adcf736687
Merge amd64.(none):/src/bug27029/my50-bug27029
...
into amd64.(none):/src/bug27029/my51-bug27029
2007-06-21 12:47:55 -04:00
iggy@amd64.(none)
39416f50a5
Bug#27029 alter table ... enable keys crashes mysqld on large table
...
- When creating an index for the sort, the number of rows plus 1 is used
to allocate a buffer. In this test case, the number of rows 4294967295
is the max value of an unsigned integer, so when 1 was added to it, a
buffer of size 0 was allocated causing the crash.
- Create new test suite for this bug's test suite as per QA.
2007-06-21 12:45:56 -04:00
tsmith@maint1.mysql.com
f1e600a78e
Merge maint1.mysql.com:/data/localhome/tsmith/bk/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
2007-06-21 18:28:52 +02:00
lars/lthalmann@dl145k.mysql.com
5c667b6fa5
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-06-21 17:13:02 +02:00
lars/lthalmann@dl145j.mysql.com
d0e786b8e9
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
2007-06-21 17:10:35 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
c1f2050087
merge rpl 5.0->5.1
2007-06-21 17:09:19 +02:00
lars/lthalmann@dl145k.mysql.com
1fb2aa8205
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-06-21 17:04:33 +02:00
msvensson@pilot.(none)
8e65f66378
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-21 16:58:22 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
fcd859ac77
Test fix
2007-06-21 16:55:52 +02:00
msvensson@pilot.(none)
840344589e
Add name of test that generated the warning to "warnings" file
2007-06-21 16:37:13 +02:00
msvensson@pilot.(none)
9ece930cd4
Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-21 15:19:28 +02:00
msvensson@pilot.(none)
c021fc9a92
Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-21 15:14:00 +02:00
mats@kindahl-laptop.dnsalias.net
7438faa16b
Test case fix to replication team tree.
2007-06-21 14:39:40 +02:00
msvensson@pilot.(none)
896faea0d3
Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-21 14:14:36 +02:00
msvensson@pilot.(none)
f3f1c8c18e
Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-21 14:10:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
03d657f60e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b28772/b28772.5.1
2007-06-21 13:26:17 +05:00
mats@kindahl-laptop.dnsalias.net
201a254788
Fixing result mismatch in rpl_deadlock_innodb result file.
2007-06-21 09:31:19 +02:00
kostja@bodhi.(none)
72ff5488be
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-06-20 19:05:38 +04:00
mats@kindahl-laptop.dnsalias.net
2f74826394
BUG#29030 (DROP USER command that errors still gets written to binary log
...
and replicated):
A DROP USER statement with a non-existing user was correctly written to
the binary log (there might be users that were removed, but not all),
but the error code was not set, which caused the slave to stop with an
error.
The error reporting code was moved to before the statement was logged
to ensure that the error information for the thread was correctly set
up. This works since my_error() will set the fields net.last_errno and
net.last_error for the thread that is reporting the error, and this
will then be picked up when the Query_log_event is created and written
to the binary log.
2007-06-20 14:24:31 +02:00
kostja@bodhi.(none)
a1fefd4e8d
Disable randomly failing tests:
...
rpl_udf -- Bug#28993 rpl_udf test causes server crash and valgrind
warning in pushbuild
rpl_ndb_circular -- Bug#29233 rpl_ndb_circular fails randomly
ndb_dd_sql_features -- Bug#29102 ndb_dd_sql_features fails in
pushbuild
2007-06-20 16:05:57 +04:00
kostja@bodhi.(none)
9ff8e6d7b5
Fix a typo.
2007-06-20 14:04:53 +04:00
msvensson@pilot.(none)
4d3f3f676f
Bug#28742 mysql-test-run is very slow on "Stopping All Servers" step
...
- Improve shutdown algorithm
- Wait up to 5 seconds for processes to exit after their port is free
2007-06-20 11:47:55 +02:00
mats@kindahl-laptop.dnsalias.net
206b2c72ba
Adding missing DROP TABLE statement to ndb_backup_print.test since it
...
causes later tests to fail.
2007-06-20 11:38:51 +02:00
dkatz@damien-katzs-computer.local
a197a9aa8a
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-06-19 18:18:59 -04:00
dkatz@damien-katzs-computer.local
bd80d7e465
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_win
2007-06-19 18:03:47 -04:00
mats@kindahl-laptop.dnsalias.net
5dd26788cc
Some test case fixes.
2007-06-19 22:18:16 +02:00
kostja@bodhi.(none)
4fd8158456
Fix a merge mistake.
2007-06-19 18:04:42 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c0b9f2266
Fix for bug #28772 : rpl_row_until fails in pushbuild
...
Problem: we use 'sleep 2; wait_for_slave_to_stop;' to reach some slave's states
which is buggy, wasteful of time, platform dependant etc.
Fix: use include/wait_for_slave_***.inc's where it's possible instead.
2007-06-19 16:06:11 +05:00
kostja@bodhi.(none)
68632318dc
Manual merge.
2007-06-19 15:02:08 +04:00
kostja@bodhi.(none)
325b8835c7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-06-19 14:53:13 +04:00
tomas@whalegate.ndb.mysql.com
027456393e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:38:37 +02:00
tomas@whalegate.ndb.mysql.com
b36a87ae91
corrected typo
2007-06-19 11:38:07 +02:00
msvensson@pilot.(none)
b8eee54d0b
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-19 11:34:54 +02:00
tomas@whalegate.ndb.mysql.com
9d8fbc462b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:31:52 +02:00
msvensson@pilot.(none)
95cf973862
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-19 11:31:34 +02:00
tomas@whalegate.ndb.mysql.com
04f1913789
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-19 11:26:23 +02:00