Commit graph

9648 commits

Author SHA1 Message Date
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
02b3293592 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-05-31 13:51:01 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
fbd7a258e2 BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok 2006-05-31 13:32:14 -04:00
ngrishakin@mysql.com
0774b37d2b disabled.def with ndb_dd_backuprestore test disabled 2006-05-30 23:21:44 +02:00
ngrishakin@mysql.com
89afd0225b Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
2006-05-30 01:37:20 +02:00
ngrishakin@mysql.com
0763f5e7b4 removed partitions from ndb_dd_backuprestore test 2006-05-30 01:36:35 +02:00
andrey@lmy004.
35b6416fcf Merge lmy004.:/work/mysql-5.1-new-vanilla
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 20:23:44 +02:00
msvensson@neptunus.(none)
10719727ff Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-29 15:43:00 +02:00
andrey@lmy004.
ea20259aac Merge lmy004.:/work/mysql-5.1-new-vanilla
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 15:16:07 +02:00
andrey@lmy004.
2a6ffba67d add missing events_grant test 2006-05-29 13:16:29 +02:00
andrey@lmy004.
b4752351f2 Fix for bug #17394 - Events namespace is wrong 2006-05-29 10:39:45 +02:00
rburnett@bk-internal.mysql.com
f4aa434fbe Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-26 15:08:24 +02:00
kent@mysql.com
7175805cd4 Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
into  mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-05-26 13:17:09 +02:00
jmiller@mysql.com
0bf4f53187 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-25 22:37:06 +02:00
jmiller@mysql.com
115bcca2d1 Removing ./r/rpl_ndb_dd_partitions.result & ./t/rpl_ndb_dd_partitions.test since NDB only will support key partitions and moving them to the test-extra tree for safe keeping 2006-05-25 22:36:03 +02:00
rburnett@bk-internal.mysql.com
61bd780166 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-25 17:47:26 +02:00
pekka@mysql.com
e929e28c7b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-05-25 16:20:36 +02:00
gluh@eagle.intranet.mysql.r18.ru
31a54240e7 test fix 2006-05-25 19:20:35 +05:00
pekka@mysql.com
ae964cb4cc Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-25 16:20:34 +02:00
gluh@mysql.com
023317d68a after merge fix 2006-05-25 19:20:34 +05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7f6afa8b2a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-25 10:20:33 -04:00
pekka@mysql.com
7fcc77f49c ndb - bug#14509 v5.1 part 2/2 : handler level 2006-05-25 12:13:47 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a95f31bd4e manual merge 2006-05-24 13:57:21 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
d1098a85eb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-24 13:41:04 -04:00
evgen@moonbone.local
516b8f0aca Manually merged 2006-05-24 20:52:57 +04:00
rburnett@bk-internal.mysql.com
9138f0ba6e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-24 14:57:44 +02:00
serg@mysql.com
c6abfd2f7f Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
into  mysql.com:/data0/mysqldev/my/mysql-5.1-release
2006-05-24 14:37:18 +02:00
serg@mysql.com
c00edb8e8a Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
2006-05-24 14:22:36 +02:00
serg@mysql.com
1841c44cfc Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
2006-05-24 12:19:39 +02:00
svoj@april.(none)
13ae6420fd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:34:24 +05:00
svoj@april.(none)
578743cd7d Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:31:39 +05:00
brian@zim.(none)
5d9ec1ee82 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 19:08:28 -07:00
jimw@mysql.com
dd81642594 Fix events_logs_tests so it won't fail on Windows due to appearance
of hostname in query results.
2006-05-23 17:51:17 -07:00
kent@mysql.com
97674810b0 don't let bugfix for bug#8303 break the bugfix for bug#8378
revert the fix for bug#8303
correct the test for bug#8378
2006-05-24 00:55:53 +02:00
rburnett@bk-internal.mysql.com
37d1e803f1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-23 20:28:52 +02:00
brian@zim.(none)
b514d3a89c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 11:25:11 -07:00
jimw@mysql.com
d2132bc04a Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 09:49:04 -07:00
msvensson@neptunus.(none)
0f1ae1305d Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-23 17:05:37 +02:00
msvensson@neptunus.(none)
9580c05ccc Make wait_timeout test not timing dependent 2006-05-23 15:45:16 +02:00
andrey@lmy004.
fd2792cbe4 Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 15:07:08 +02:00
andrey@lmy004.
fb42ce5fd7 update log_tables.test so it is less fragile 2006-05-23 15:01:23 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0bd08dd4b6 BUG#19304: Merge handler allowed in partitioned tables 2006-05-23 07:37:03 -04:00
andrey@lmy004.
c04a800f3d Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 12:13:02 +02:00
andrey@lmy004.
f234eef13b update result
drop users at the end of events_stress
2006-05-23 12:10:07 +02:00
msvensson@neptunus.(none)
b9779e9acd Move the requirement for "not running as root" to information_schema_chmod 2006-05-23 10:52:53 +02:00
andrey@lmy004.
60b75a3a02 make it less stressful. some pushbuild boxes cannot cope with it 2006-05-23 10:49:09 +02:00
gluh@eagle.intranet.mysql.r18.ru
474ef8ed43 Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode
transfer NO_DEFAULT_VALUE_FLAG flag to new field
2006-05-23 13:27:45 +05:00
anozdrin@mysql.com
f0a01456e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
2006-05-23 12:08:47 +04:00
gluh@eagle.intranet.mysql.r18.ru
457aea43fc Bug#16681 information_schema shows forbidden VIEW details
show view definition to users that have the needed privilleges
2006-05-23 12:45:25 +05:00
jimw@mysql.com
26d6e5651d Merge mysql.com:/home/jimw/my/mysql-5.1-20004
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-22 13:21:50 -07:00
andrey@lmy004.
3ced49d2f6 manual merged 2006-05-22 21:57:23 +02:00