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
mskold@mysql.com
cdccc77244
Merge mysql.com:/home/marty/MySQL/mysql-4.1
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-05-22 15:16:37 +02: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
msvensson@neptunus.(none)
592a2a7510
Move innodb dependent tests to group_min_max_innodb
2006-05-22 14:10:02 +02:00
msvensson@neptunus.(none)
5367facc66
Move innodb dependent test to join_outer_innodb
2006-05-22 13:57:32 +02:00
msvensson@neptunus.(none)
6202cd0f6e
Move innodb dependent tests to func_group_innodb
2006-05-22 13:27:58 +02: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
grog@mysql.com
c21e6498b1
rpl_auto_increment_11932.test, rpl_auto_increment_11932.result:
...
Drop test1 table in master as well.
2006-05-22 12:18:18 +09:30
grog@mysql.com
38fbaccabb
Merge mysql.com:/home/MySQL/5.0-Bug-11932-old
...
into mysql.com:/home/MySQL/5.0-Bug-11932
2006-05-22 10:08:51 +09:30
grog@mysql.com
832089c49e
rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:
...
Update with correct table and database names.
2006-05-22 10:08:13 +09:30
grog@mysql.com
08cbbbf7d6
Merge mysql.com:/home/MySQL/5.0-Bug-11932-old
...
into mysql.com:/home/MySQL/5.0-Bug-11932
2006-05-22 10:04:23 +09:30
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
igor@rurik.mysql.com
4a27cbfd02
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-05-20 19:10:43 -07:00
igor@rurik.mysql.com
12e53358f0
Fixed bug #19089 .
...
When a CREATE TABLE command created a table from a materialized
view id does not inherit default values from the underlying table.
Moreover the temporary table used for the view materialization
does not inherit those default values.
In the case when the underlying table contained ENUM fields it caused
misleading error messages. In other cases the created table contained
wrong default values.
The code was modified to ensure inheritance of default values for
materialized views.
2006-05-20 18:54:43 -07:00
aelkin@mysql.com
4d512f3854
#14157 : utf8 encoding in binlog without set character_set_client
...
fixing an issue with the test portability.
2006-05-20 12:34:56 +03:00
kent@mysql.com
5c69c5b164
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-20 09:49:03 +02:00
jimw@mysql.com
8262c3c38e
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-19 19:07:33 -07:00
jimw@mysql.com
2b13192c2e
Merge mysql.com:/home/jimw/my/mysql-5.0-1039
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-19 16:17:24 -07:00
kent@mysql.com
d0f40d7d72
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-20 00:09:08 +02:00
tomas@poseidon.ndb.mysql.com
00188154c9
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-19 23:20:33 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
2562900269
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
2006-05-19 16:09:36 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4ae3a672c3
New test case
2006-05-19 16:08:06 -04:00
msvensson@shellback.(none)
15b6bd3fe1
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-05-19 17:19:57 +02:00
rburnett@bk-internal.mysql.com
327a77b22f
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-19 16:39:37 +02:00
msvensson@shellback.(none)
30accebbde
Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select
...
Add verbose printouts
2006-05-19 16:28:08 +02:00
kent@mysql.com
de7e522fda
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-19 14:00:30 +02:00
sergefp@mysql.com
49e23937e4
Merge mysql.com:/home/psergey/tmp_merge
...
into mysql.com:/home/psergey/mysql-5.1-merge
2006-05-19 16:00:29 +04:00
ramil@mysql.com
13baf7575f
Fix for bug #18536 : mysqldump does not maintain table orders as per --tables option
2006-05-19 16:21:32 +05:00
msvensson@shellback.(none)
2c912f9d80
Add mtr_verbose to print more verbose output when --verbose flag is used
2006-05-19 11:42:53 +02:00
msvensson@shellback.(none)
0c9c9ef6fc
Remove printout when restart is skipped
2006-05-19 09:13:25 +02:00
grog@mysql.com
3588039c71
Merge mysql.com:/home/MySQL/5.0-Bug-14765.old
...
into mysql.com:/home/MySQL/5.0-Bug-14765
2006-05-19 13:27:35 +09:30
tomas@poseidon.ndb.mysql.com
d0fd5ecde8
Bug #19395 mysqld does not always detect cluster shutdown
...
Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
2006-05-18 23:38:07 +02:00
msvensson@shellback.(none)
3a3690a934
Start servers in parallel
...
Add list of clusters and nodes
2006-05-18 23:35:17 +02:00
petr@mysql.com
e8d9458f15
WL#3244 "CSV engine: convert mmap to read/write calls"
2006-05-19 01:26:19 +04:00
igor@rurik.mysql.com
710d422404
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-05-18 13:17:59 -07:00
lars@mysql.com
399a1b845b
After merge fixes
2006-05-18 21:40:52 +02:00
igor@rurik.mysql.com
3b3e6ecb95
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2006-05-18 11:30:42 -07:00