igor@rurik.mysql.com
1afc70d03e
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-2
2006-04-20 17:00:29 -07:00
igor@rurik.mysql.com
0a65106cfb
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 16:14:17 -07:00
konstantin@mysql.com
f14040e4d8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-20 20:49:41 +04:00
igor@rurik.mysql.com
18149be57c
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 07:24:34 -07:00
mskold@mysql.com
ed31665b2a
Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes
2006-04-20 13:32:41 +02:00
mskold@mysql.com
15ca6daf6f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 11:11:21 +02:00
mats@mysql.com
4b605314e3
Bug#16993 (ALTER TABLE ADD col AUTO_INCREMENT does not replicate):
...
Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.
2006-04-20 08:56:47 +02:00
igor@rurik.mysql.com
a6be98b8a8
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-19 10:45:06 -07:00
konstantin@mysql.com
6d277eb89d
Merge mysql.com:/opt/local/work/tmp_merge
...
into mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-19 21:12:24 +04:00
mats@mysql.com
eee166d859
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-19 15:33:31 +02:00
mats@mysql.com
97f9cf23a8
Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):
...
This is not a bug. Enabling disabled test and adding comment.
2006-04-19 15:29:49 +02:00
monty@mysql.com
ed809462e9
Fixed timeing problem by ignoring failures and results from first select after table definition change
2006-04-19 12:21:33 +03:00
bar@mysql.com
a26f115a13
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 11:42:41 +05:00
bar@mysql.com
cedafc30e8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 09:50:17 +05:00
bar@mysql.com
004854fbdd
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-19 09:22:04 +05:00
mskold@mysql.com
1516bb1318
Updated result file
2006-04-18 12:16:27 +02:00
igor@rurik.mysql.com
e178ec2fc8
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-17 16:40:16 -07:00
cmiller@zippy.(none)
61552172df
Fixing a merge from a few days ago.
...
Without a flush this test is nondeterministic for "row" binlog-format.
2006-04-17 18:57:01 -04:00
pekka@mysql.com
9f355db66e
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-04-18 00:56:59 +02:00
mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se
9c6aef5b4e
BUG#18752
...
Fixed forgotten merge fix
2006-04-17 18:56:58 -04:00
pekka@mysql.com
4d1e38744d
ndb - bug#16796
2006-04-17 20:24:41 +02:00
brian@zim.(none)
98f2cd4468
Fixed a few pieces around support for data directory.
2006-04-16 21:55:02 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
5dc6310712
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-15 09:47:33 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
d73e985ac1
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-14 17:50:32 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd868aecbb
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-14 17:48:27 -04:00
cmiller@zippy.(none)
c7513d482f
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-04-14 13:33:02 -04:00
cmiller@zippy.(none)
1d1040e1ea
Hand-merged test.
2006-04-14 11:39:36 -04:00
cmiller@zippy.(none)
4671650387
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
(With hand-merged tests.)
2006-04-14 11:38:09 -04:00
bar@mysql.com
e75d52711a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-14 13:57:46 +05:00
bar@mysql.com
ed6899c64f
Merge mysql.com:/usr/home/bar/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-14 13:34:18 +05:00
igor@rurik.mysql.com
dbd87b39c0
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-04-13 08:41:15 -07:00
tomas@poseidon.ndb.mysql.com
d878c904c2
BUG#18976 test workaround
2006-04-13 15:16:02 +02:00
sergefp@mysql.com
34b2ed5f7f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-csc9139
2006-04-13 16:07:48 +04:00
sergefp@mysql.com
1d3a0c0ec8
BUG#19021, Crash in ROR-index_merge optimizer:
...
get_best_covering_ror_intersect() was copying ror_scans starting from the
end of the array and not from its beginning.
2006-04-13 16:05:32 +04:00
tomas@poseidon.ndb.mysql.com
07753c59a0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-13 10:48:24 +02:00
igor@rurik.mysql.com
e6ce72fcef
Fixes after manual merge.
2006-04-12 18:15:39 -07:00
igor@rurik.mysql.com
316eeff690
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-12 16:14:20 -07:00
konstantin@mysql.com
c49e6f8869
Post-merge fixes. Add a new error message for max_prepared_stmt_count
...
limit.
2006-04-13 01:46:44 +04:00
igor@rurik.mysql.com
fb75fcde65
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-12 13:23:11 -07:00
tomas@poseidon.ndb.mysql.com
10692ba84f
increase save_master_pos timeout to 30 seconds for higher test predictability
...
better replicaiton test cleanup to ensure better test predictability
+ some ndb test cleanup
2006-04-12 15:55:41 +02:00
bar@mysql.com
2b970995e3
Bug#18736 test case 'upgrade' fails
...
"upgrade" failed on windows, because of lower_case_table_name.
This fix changes letters to lower case, not to depend on OS.
Note, this change does not affect coverage of
Bug N 17142 "Crash if create with encoded name",
which the test war originally written for.
2006-04-12 14:45:37 +05:00
bar@mysql.com
f4eb0eb1dd
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b18285
2006-04-12 13:31:04 +05:00
msvensson@neptunus.(none)
dd34c82490
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-12 08:33:35 +02:00
jimw@mysql.com
b02463c15a
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-11 16:03:49 -07:00
cmiller@zippy.(none)
a1e78b3d36
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-11 16:39:09 -04:00
msvensson@neptunus.(none)
52c9feff13
Bug#18012 mysqlslap fails if querystring starts with delimiter
...
- Terminate loop not only when the limit is met, but alse when there is no more stmts
2006-04-11 22:23:16 +02:00
jimw@mysql.com
7e96d6eeef
Merge mysql.com:/home/jimw/my/mysql-5.1-17139
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-11 12:06:49 -07:00
bar@mysql.com
fdd9b478fe
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b18285
2006-04-12 00:06:48 +05:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
77860367af
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
...
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
2006-04-11 15:00:06 -04:00
igor@rurik.mysql.com
abc16b5b00
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-11 11:46:28 -07:00