andrey@lmy004.
9951b9db96
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-08 11:54:37 +01:00
tomas@poseidon.ndb.mysql.com
d3a80b4710
Bug #17200 Comment for SHOW ENGINES should be changed for Cluster
2006-02-08 11:29:46 +01:00
konstantin@mysql.com
d4c5516929
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:11:44 +03:00
reggie@linux.site
760bc0a225
bug# 17082 Client hangs when creating tables with partition
...
This bug was only on Windows but we updated the call to
create_temporary_file to match what is being done in other
areas of MySQL
2006-02-08 04:05:18 -06:00
reggie@linux.site
88ba26e15f
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-02-08 04:05:17 -06:00
konstantin@mysql.com
7452faa503
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:01:27 +03:00
anozdrin@mysql.com
66e1e8d4a6
Fix for BUG#17180: Failure in trigger-grant on Solaris.
...
The problem is that LEX_STRING was used instead of LEX_STRING::str.
2006-02-08 12:54:54 +03:00
anozdrin@mysql.com
e24336b0c8
Fix compilation failure.
2006-02-08 12:51:28 +03:00
brian@zim.tangent.org
23d99ee03c
The handlerton structures for archive and CSV had not been updated. Nicht so gute. I also fixed CSV to use fast alter table and put in a test in archive in case someone tries to do the same there (hint... it won't work).
2006-02-07 22:42:57 -08:00
ramil@mysql.com
ebe1eed8aa
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-08 10:34:30 +04:00
petr@mysql.com
7aa7e4b437
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/devel/5.1-utf-bug
2006-02-08 09:15:41 +03:00
andrey@lmy004.
fa143d255c
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16984
2006-02-07 23:57:39 +01:00
andrey@lmy004.
4b0f608472
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-07 23:40:03 +01:00
kent@mysql.com
d6be5dcecb
sql_plugin.cc:
...
Bug#17196, --default-storage-engine option broken
configure.in:
This is an alpha
2006-02-07 22:39:55 +01:00
konstantin@mysql.com
da377d1ec8
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 00:33:31 +03:00
konstantin@mysql.com
e656863033
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 00:02:56 +03:00
pekka@mysql.com
14249f23ed
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2006-02-07 21:52:56 +01:00
reggie@linux.site
e74b609881
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-02-07 13:54:42 -06:00
gunnar@mysql.com.
f6590a3b89
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com.:/data/BK/mysql-5.0
2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2006-02-07 20:04:54 +01:00
msvensson@neptunus.(none)
4ddcc7ccc2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 20:02:08 +01:00
pekka@mysql.com
9aa06f3bc1
ndb - bug#15918 fix
2006-02-07 19:57:31 +01:00
andrey@lmy004.
64c34f101f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-07 19:37:26 +01:00
andrey@lmy004.
4ba2a3322b
- fix for bug #16414 (Events: Crash or hang if event drops itself)
...
WL#1034 (Internal CRON)
(with post-review fix)
2006-02-07 19:28:33 +01:00
andrey@lmy004.
335c6e8877
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16984
2006-02-07 19:23:39 +01:00
tomas@poseidon.ndb.mysql.com
99cbc34b44
Bug #17188 CRBR: ignores --binlog_ignore_db= settings
2006-02-07 19:02:38 +01:00
msvensson@neptunus.(none)
4fc2b92692
Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 18:12:23 +01:00
reggie@linux.site
824ac10fbc
BUG# 17082 - Client hangs when creating tables with partition
...
no test case needed since simply creating a partitioned table
reproduces it.
2006-02-07 10:45:11 -06:00
tomas@poseidon.ndb.mysql.com
53040a0762
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-07 17:45:10 +01:00
gunnar@mysql.com.
a0b0cb5551
Merge mysql.com.:/data/BK/mysql-5.0
...
into mysql.com.:/data/BK/mysql-5.0_8461_b
2006-02-07 17:15:12 +01:00
knielsen@mysql.com
357eb838b5
Merge mysql.com:/usr/local/mysql/mysql-5.1-winfix
...
into mysql.com:/usr/local/mysql/mysql-5.1-release
2006-02-07 16:34:41 +01:00
tomas@poseidon.ndb.mysql.com
776bc2a6f2
Bug #17005 Ndb partition handling for create table like is broken
2006-02-07 16:31:20 +01:00
knielsen@mysql.com
8269fe79a4
Add cast to fix Windows compilation.
2006-02-07 16:30:26 +01:00
serg@serg.mylan
0eb36bf015
fixes for the ER_CANT_OPEN_LIBRARY message
2006-02-07 15:24:34 +01:00
konstantin@mysql.com
30ddc47ab0
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-07 15:26:58 +03:00
gunnar@mysql.com.
001224c09d
item_func.cc:
...
fix for bug#8461
BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
Changed the integer routine to work on integers only.
This bug affects 4.1, 5.0 and 5.1
Fixing in 4.1 will need to change the routine to handle different types individually.
5.0 did had different routines for different types already just the INTEGER routine was bad.
2006-02-07 13:26:35 +01:00
svoj@april.(none)
328b59a5ed
Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
2006-02-07 15:30:32 +04:00
tomas@poseidon.ndb.mysql.com
f964e1367f
Bug #17087 No warning on cluster failure for IS.FILES
2006-02-07 12:16:24 +01:00
svoj@april.(none)
0488462a58
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 14:49:57 +04:00
tomas@poseidon.ndb.mysql.com
407d98b946
Bug#17081 LOAD DATA INFILE" may not load all the data
...
Bug #17154 load data infile hangs when duplicate key encountered
2006-02-07 11:47:04 +01:00
tomas@poseidon.ndb.mysql.com
6fe11666fd
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-07 11:31:52 +01:00
tomas@poseidon.ndb.mysql.com
06a57659d8
Bug #17081 "LOAD DATA INFILE" may not load all the data
2006-02-07 11:30:42 +01:00
svoj@april.(none)
91296df576
Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 13:49:55 +04:00
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
ramil@mysql.com
221b35783d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-07 12:06:06 +04:00
tomas@poseidon.ndb.mysql.com
c445b29d4d
ndb, transaction should be refgistred even if m_transaction_on is not set
2006-02-07 00:26:47 +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
69b33265cf
merge
2006-02-06 21:52:27 +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