andrey@lmy004.
743a57fda1
disable events_logs_tests
2006-05-16 12:05:15 +02:00
tulin@production.mysql.com
d4c739fda3
information_schema.result:
...
corrected merge
2006-05-16 12:00:17 +02:00
sergefp@mysql.com
b7c52881d1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 13:46:30 +04:00
tomas@poseidon.ndb.mysql.com
6cb699d208
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:37:40 +02:00
knielsen@mysql.com
62e0e90a51
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-05-16 10:34:12 +02:00
tomas@poseidon.ndb.mysql.com
08438b6054
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:21:37 +02:00
lars@mysql.com
a29504cbcb
Test used a charset not available on many platforms
2006-05-16 10:01:07 +02:00
pekka@mysql.com
d0d8b6c9f3
Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
...
into mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-16 09:37:11 +02:00
lars@mysql.com
3b8a10dbd7
Fixed result file (rpl_temporary)
2006-05-16 09:26:57 +02:00
tnurnberg@mysql.com
0613889746
Merge mysql.com:/home/tmp_merge
...
into mysql.com:/home/mysql-5.1-18997e
2006-05-16 03:33:43 +02:00
tnurnberg@mysql.com
d1311e1ac7
Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value
...
if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.
2006-05-16 03:32:24 +02:00
cmiller@zippy.(none)
d8330e2858
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-15 19:26:49 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
414d5c0983
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-16 00:37:34 +03:00
knielsen@mysql.com
70aa60752c
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-05-15 23:21:37 +02:00
knielsen@mysql.com
2abf957c91
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-05-15 22:12:17 +02:00
lars@mysql.com
3148efad35
Merge mysql.com:/users/lthalmann/bkroot/andrei-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
2006-05-15 20:49:14 +02:00
tomas@poseidon.ndb.mysql.com
5971c0872b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-15 20:35:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1b524d6b5f
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-15 21:33:47 +03:00
aelkin@dl145j.mysql.com
6bdd2bbcc1
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/andrei/5.0
2006-05-15 19:57:11 +02:00
knielsen@mysql.com
5d1c68ed35
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:11 +02:00
reggie@big_geek.
34396a5d24
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
...
into big_geek.:C:/Work/mysql/mysql-5.1
2006-05-15 12:44:20 -05:00
reggie@big_geek.
7876c07b51
patch to get archive test working on Windows.
2006-05-15 12:31:14 -05:00
tomas@poseidon.ndb.mysql.com
747dc71f9f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-15 18:44:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3846438a9c
Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table"
...
The problem is that in a MyISAM table the following column
after a varchar field gets corrupted, if varchar field is
extended.
This should be made to work without a copy in the future, but
I'm not sure if this code is ready yet. This fix will force copy
in this case. It will not do any harm to have it here, only makes
alter table a bit slower in this case. If this should work for
MyISAM, then the bug is somewhere else in that code.
Until it works, I propose this as a temporary fix or a workaround.
Test case for the bug has been added.
2006-05-15 19:41:04 +03:00
tomas@poseidon.ndb.mysql.com
271c72aa03
Bug #16875 , correction of previous patch
2006-05-15 17:16:21 +02:00
tomas@poseidon.ndb.mysql.com
fe9934c9fe
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
...
- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid
2006-05-15 16:23:59 +02:00
knielsen@mysql.com
c16b1f8676
Removed two duplicate/redundant suppressions.
...
Added some suppressions needed for Valgrind on RHAS3 64-bit.
2006-05-15 15:06:46 +02:00
sergefp@mysql.com
e5ae30fdef
BUG#19618: Crash for unsigned_col NOT IN (-1, ... )
...
- When manually constructing a SEL_TREE for "t.key NOT IN(...)", take into account that
get_mm_parts may return a tree with type SEL_TREE::IMPOSSIBLE
- Added missing OOM checks
- Added comments
2006-05-15 14:18:23 +04:00
tomas@poseidon.ndb.mysql.com
2c0955bda0
Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug
2006-05-15 10:50:31 +02:00
konstantin@mysql.com
85c6883146
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-05-15 00:51:12 +04:00
aelkin@mysql.com
45d553a44c
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-05-14 20:50:15 +03:00
aelkin@mysql.com
ab440799e1
BUG#14157: utf8 encoding in binlog without set character_set_client
...
fixing names length. Got an issue when merged to 5.0, decided to fix starting from 4.1
2006-05-14 20:09:09 +03:00
holyfoot@deer.(none)
b457eaba71
bug 15430 (init_connect test fails with the embedded server)
...
mysqltest program should be really multithreaded to perform this
test with the embedded server. So this test disabled until we
redo mysqltest this way
2006-05-14 21:49:33 +05:00
holyfoot@deer.(none)
447e9f019f
bug #15435 (wait_timeout.test fails with the embedded server)
...
this test just can't work in the embedded server
2006-05-14 21:43:22 +05:00
holyfoot@mysql.com
250e07b652
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.14573
2006-05-14 20:56:22 +05:00
aelkin@mysql.com
c90ae2d2e5
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-05-14 11:35:33 +03:00
kent@mysql.com
72a47d06f4
valgrind.supp:
...
Added suppressions for Red Hat AS 4
2006-05-14 01:14:47 +02:00
igor@rurik.mysql.com
a0df09eee2
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2006-05-13 12:02:47 -07:00
igor@rurik.mysql.com
058cba6b11
Fixed bug #19396 : a crash for a an outer join operation
...
over two views when using syntax with curly braces.
Each outer join operation must be placed in a separate
nest. This was not done when the syntax with curly braces
was used. In some cases, in particular, for queries with outer
join operation over views it could cause a crash.
2006-05-13 11:56:05 -07:00
brian@zim.(none)
a93be9f957
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-13 11:40:27 -07:00
sergefp@mysql.com
a70bfd6c69
Merge mysql.com:/home/psergey/tmp_merge3
...
into mysql.com:/home/psergey/mysql-5.1-merge2
2006-05-13 22:40:26 +04:00
aelkin@mysql.com
27696712ef
BUG#14157: utf8 encoding in binlog without set character_set_client
...
fixing a path to find charset by $MYSQL client. I believe the fix is done what should be
by default.
2006-05-13 12:14:20 +03:00
gluh@eagle.intranet.mysql.r18.ru
98b81c4f25
Bug#17048 CREATE TABLE ... SELECT truncate values
...
remove initialization of unsigned_flag for Item_decimal
2006-05-13 13:13:05 +05:00
acurtis@xiphis.org
ff71980af7
fix binlog results
2006-05-13 01:09:00 -07:00
acurtis@xiphis.org
a84822afde
fix partition test
2006-05-12 22:30:13 -07:00
igor@rurik.mysql.com
90f227043b
Fixed bug #19490 . The bug that caused server crash manifested
...
itself when executing queries referring to a view with GROUP BY
an expression containing non-constant interval.
It happened because Item_date_add_interval::eq neglected the
fact that the method can be applied to an expression of the form
date(col) + interval time_to_sec(col) second
at the time when col could not be evaluated yet.
An attempt to evaluate time_to_sec(col) in this method resulted
in a crash.
2006-05-12 18:24:38 -07:00
acurtis@xiphis.org
4e2c63a7ba
Merge bk-internal:/home/bk/mysql-5.1-new
...
into xiphis.org:/home/acurtis/mysql-5.1-merge
2006-05-12 17:40:58 -07:00
ngrishakin@mysql.com
5caf8bc77b
Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
2006-05-13 01:32:24 +02:00
ngrishakin@mysql.com
e4497ace5f
.del-ndb_partition_range.result~17fc1db754d4153d:
...
Delete: mysql-test/r/ndb_partition_range.result
.del-ndb_partition_list.result~7af68cd45e74abf:
Delete: mysql-test/r/ndb_partition_list.result
.del-ndb_partition_key.result~68b9a59cff8c9840:
Delete: mysql-test/r/ndb_partition_key.result
.del-ndb_partition_error.result~944f84894e323e9:
Delete: mysql-test/r/ndb_partition_error.result
.del-ndb_blob_partition.result~fda88ddfc5477a7e:
Delete: mysql-test/r/ndb_blob_partition.result
.del-ndb_partition_range.test~af8f9016b6648239:
Delete: mysql-test/t/ndb_partition_range.test
.del-ndb_partition_list.test~940289b3d58595ca:
Delete: mysql-test/t/ndb_partition_list.test
.del-ndb_partition_key.test~ed7b15c91f66558d:
Delete: mysql-test/t/ndb_partition_key.test
.del-ndb_partition_error.test~2da477be29be041f:
Delete: mysql-test/t/ndb_partition_error.test
.del-ndb_blob_partition.test~ea99ef9759705ce3:
Delete: mysql-test/t/ndb_blob_partition.test
2006-05-13 01:30:44 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4bab3eed28
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-12 22:47:21 +03:00