svoj@april.(none)
a67d8f9043
Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 13:49:03 +04:00
jmiller@mysql.com
23b68e3a5a
More test case updates for using RPL with NDB as default engine
2006-02-07 00:18:10 +01:00
tomas@poseidon.ndb.mysql.com
3f6671d72a
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-07 00:06:28 +01:00
tomas@poseidon.ndb.mysql.com
5bbb5c29b7
Bug #17154 load data infile of char values into a table of char(PK) hangs
...
Bug #17158 load data infile of char values into table of char with no (PK) fails to load
Bug #17081 Doing "LOAD DATA INFILE" directly after delete can cause missing data
2006-02-07 00:03:39 +01:00
jonas@perch.ndb.mysql.com
78e437e868
Merge perch.ndb.mysql.com:/home/jonas/src/51-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-06 21:31:34 +01:00
igor@rurik.mysql.com
b25b4e9b5e
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-06 11:40:39 -08:00
igor@rurik.mysql.com
3af0eabc7f
Fixed bug #16203 .
...
If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.
2006-02-06 11:35:13 -08:00
lars@mysql.com
6697e6aff3
Two new tests for replace_regex
2006-02-06 18:25:12 +01:00
pem@mysql.com
c289a3b60e
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug16303/mysql-5.0
2006-02-06 17:58:15 +01:00
sergefp@mysql.com
0fa18a4623
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-wl2985-postfixes
2006-02-06 19:11:14 +03:00
tomas@poseidon.ndb.mysql.com
7a9265cf58
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-06 17:11:13 +01:00
tomas@poseidon.ndb.mysql.com
be62923948
Bug #17160 test case ndb_restore leaves a core file
2006-02-06 17:10:03 +01:00
sergefp@mysql.com
a906e3c62d
WL#2985 "Partition pruning", "do pruning for UPDATE/DELETE": Post-merge fixes
2006-02-06 18:33:39 +03:00
pem@mysql.com
62d2511df5
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug16303/mysql-5.0
2006-02-06 16:07:13 +01:00
pem@mysql.com
5debbc9e8a
Updated sp-code.result after merge (BUG#16568)
2006-02-06 16:05:46 +01:00
jmiller@mysql.com
726076b8cb
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-06 15:59:37 +01:00
tomas@poseidon.ndb.mysql.com
cc47880702
harmonized mysql-test-run.sh and .pl
...
+ added current test printout to error file
2006-02-06 15:42:26 +01:00
petr@mysql.com
c29f832a68
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
2006-02-06 17:35:10 +03:00
pem@mysql.com
2d340a875c
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug16568/mysql-5.0
2006-02-06 14:09:14 +01:00
anozdrin@mysql.com
0869f3b8a6
Fix merge (5.0 -> 5.1) of the patch for BUG#15166/15196.
2006-02-06 16:05:20 +03:00
jonas@perch.ndb.mysql.com
3c164107b0
bug#16767, bug#16768 - ndb missleading names of error codes
...
rename error codes
2006-02-06 13:27:16 +01:00
anozdrin@mysql.com
4d8a51ca9d
Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rev-1.2004.2.1
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree
2006-02-06 15:23:17 +03:00
sergefp@mysql.com
60f2321b51
Merge
2006-02-05 23:49:32 +03:00
pekka@mysql.com
738db4f1a2
ndb - rbr blobs works now (or again)
2006-02-05 19:11:11 +01:00
aelkin@mysql.com
0c95fd2376
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/tmp_merge
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-04 11:06:17 +02:00
aelkin@mysql.com
217499df86
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-04 10:25:46 +02:00
konstantin@mysql.com
a55b7a9f13
A post-merge fix.
2006-02-03 23:21:17 +03:00
konstantin@mysql.com
5e03bf7f93
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-03 21:10:03 +03:00
ingo@mysql.com
8906937757
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-wl1563-msg
2006-02-03 17:57:23 +01:00
jmiller@mysql.com
cac41af212
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-03 16:06:20 +01:00
jmiller@mysql.com
43a9daf0b8
Implemented requested changes by Lars and did some general test cleanup. Lots more togo
2006-02-03 15:38:27 +01:00
pekka@mysql.com
c696582df4
ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ]
2006-02-03 15:23:58 +01:00
pekka@mysql.com
7b892368c3
ndb - bugfix: tinyblob + replace => mysqld crash (no bug#)
2006-02-03 14:35:29 +01:00
petr@mysql.com
b221e37b7d
Fix for Bug#16905 Log tables: unicode statements are logged incorrectly
2006-02-03 13:05:14 +03:00
igor@rurik.mysql.com
66b6c988f5
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-03 00:07:57 -08:00
igor@rurik.mysql.com
7b58b91fe4
Fixes after manual merge
2006-02-02 23:56:08 -08:00
igor@rurik.mysql.com
f61517d60b
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-02 21:23:36 -08:00
igor@rurik.mysql.com
3f9bb37461
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-02-02 17:39:38 -08:00
jmiller@mysql.com
4ae74a8133
First set of rpl test updated for NDB and general test cleanup
2006-02-03 01:59:02 +01:00
konstantin@mysql.com
cb7118edcd
One more post-merge fix.
2006-02-03 02:01:01 +03:00
igor@rurik.mysql.com
b32ce5ac79
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-02 13:47:21 -08:00
konstantin@mysql.com
303ad65fb2
Post-merge fixes.
2006-02-03 00:07:36 +03:00
konstantin@mysql.com
9f0bb47f87
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 23:27:06 +03:00
jimw@mysql.com
95f1b04929
Remove extra space in SHOW CREATE TABLE output. (Bug #13883 )
2006-02-02 11:39:28 -08:00
dlenev@mysql.com
36e9bd0344
Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges
2006-02-02 22:12:06 +03:00
gunnar@mysql.com.
b413d72850
Merge mysql.com.:/data/BK/mysql-4.1_15828
...
into mysql.com.:/data/BK/mysql-5.0_15828
2006-02-02 19:10:27 +01:00
tomas@poseidon.ndb.mysql.com
6e0d64565f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 16:44:22 +01:00
tomas@poseidon.ndb.mysql.com
ce8308a503
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-02 16:19:49 +01:00
konstantin@mysql.com
98091b152a
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
tomas@poseidon.ndb.mysql.com
8978db5ec6
added more logging in ndb handler
...
enable extra logging in ndb handler during test runs
2006-02-02 16:12:18 +01:00