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
konstantin@mysql.com
9e635c7bfe
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-05-24 14:54:35 +04:00
svoj@april.(none)
73ae726d60
Merge april.(none):/home/svoj/devel/mysql/BUG12873/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
2006-05-24 15:19:48 +05: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
msvensson@neptunus.(none)
dcf9810cb1
Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-24 10:16:31 +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
svoj@april.(none)
fb27799a86
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
2006-05-24 10:47:09 +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
gkodinov@mysql.com
d81a8437e4
Bug #18742 : Test 'group_min_max' fails if "classic" configuration in 5.0
...
Moved the InnoDB related tests to innodb_mysql
2006-05-23 16:43:01 +03: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
svoj@april.(none)
59302e5540
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
2006-05-23 17:30:55 +05:00
andrey@lmy004.
9670bb6ae4
Merge lmy004.:/work/mysql-5.1-release
...
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 13:49:24 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
b756f55af0
BUG#17455: Wrong results from Repair/Optimize .. table for partitioned tables
2006-05-23 07:39:35 -04: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.
86052a9567
various fixes after push of fix for bug#17619
2006-05-23 13:32:22 +02: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
igor@rurik.mysql.com
4a673444f7
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-05-22 12:55:28 -07:00
andrey@lmy004.
b429d73d62
fix for bug #17619 Scheduler race conditions
...
- Scheduler is either initialized at server start or never.
Starting & stopping is now suspending & resuming.
- The scheduler has clear OO interface
- Now all calls to the scheduler are synchronous
- GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc)
- External API is encapsulated into class Events
- Includes fixes for all comments of Kostja's review of 19.05.2005
Starting to merge into 5.1-release (5.1.10) and push
2006-05-22 20:46:13 +02:00
brian@zim.(none)
f99ce7ad62
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-22 11:40:29 -07:00
jimw@mysql.com
a995439b12
Bug #20004 : log_tables fails on Windows due to output differences
...
This test included hostname information in the output, which varies
between platforms.
2006-05-22 11:34:41 -07:00
rburnett@bk-internal.mysql.com
179d483355
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-22 17:25:46 +02:00
gkodinov@mysql.com
b2494b8174
Merge mysql.com:/home/kgeorge/mysql/5.0/B18745
...
into mysql.com:/home/kgeorge/mysql/5.1/B18745
2006-05-22 18:15:47 +03:00
igor@rurik.mysql.com
a6aaca7d6a
Post-review fixes for bug #19089
2006-05-22 07:57:46 -07:00
gkodinov@mysql.com
b357c232fc
Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration
...
Moved the InnoDB related test from func_group.test to innodb_mysql.test
2006-05-22 16:10:53 +03:00
anozdrin@mysql.com
e3d0c1a7f1
Merged.
2006-05-22 15:20:40 +04:00
anozdrin@mysql.com
4a43bd1a3a
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-22 14:22:58 +04:00
ramil@mysql.com
71c035fafb
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b18536
2006-05-22 11:49:35 +05:00
pekka@mysql.com
641c92dd62
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my51
2006-05-21 21:58:00 +02:00
holyfoot@mysql.com
b9cd71e622
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-21 18:22:13 +05:00
holyfoot@mysql.com
00f3ca8d27
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.clean
2006-05-21 18:19:51 +05:00
pekka@mysql.com
1a519e2971
ndb - bug#19956 (occurs only in v5.0)
2006-05-21 11:04:57 +02:00