reggie@linux.site
cb10b77c31
BUG #15408 - Partitions: subpartition names are not unique
2006-02-21 17:40:07 -06:00
konstantin@mysql.com
f0abdf1ebe
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-02-22 01:20:47 +03:00
jmiller@mysql.com
eafd514e1a
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-21 18:24:44 +01:00
konstantin@mysql.com
442c2ba8af
A fix and a test case for Bug#13134 "Length of VARCHAR() utf8
...
column is increasing when table is recreated with PS/SP":
make use of create_field::char_length more consistent in the code.
Reinit create_field::length from create_field::char_length
for every execution of a prepared statement (actually fixes the
bug).
2006-02-21 19:52:20 +03:00
reggie@linux.site
336c0ba4cb
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1-bug15408
2006-02-21 10:29:41 -06:00
msvensson@neptunus.(none)
6efee6c42c
Merge neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 17:25:21 +01:00
msvensson@neptunus.(none)
e35e380072
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 17:21:21 +01:00
msvensson@neptunus.(none)
334b9c7a27
Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 17:19:46 +01:00
msvensson@neptunus.(none)
d722c5c60d
Merge neptunus.(none):/home/msvensson/mysql/bug16878/my50-bug16878
...
into neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
2006-02-21 17:15:37 +01:00
msvensson@neptunus.(none)
b0b002e4f5
Bug#14354 Partitions: data directory clause fails
...
- Use "system" to execute rm, mkdir etc
- Use MYSQLTEST_VARDIR
2006-02-21 17:09:09 +01:00
evgen@moonbone.local
e6924206cd
Fixed bug#17530: Incorrect key truncation on table creation caused server crash.
...
When a too long field is used for a key, only a prefix part of the field is
used. Length is reduced to the max key length allowed for storage. But if the
field have a multibyte charset it is possible to break multibyte char
sequence. This leads to the failed assertion in the innodb code and
server crash when a record is inserted.
The make_prepare_table() now aligns truncated key length to the boundary of
multibyte char.
2006-02-21 18:09:32 +03:00
msvensson@neptunus.(none)
d35ba92a24
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 15:57:56 +01:00
msvensson@neptunus.(none)
a699a2ea1b
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 15:05:58 +01:00
msvensson@neptunus.(none)
f64effb570
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
...
into neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
2006-02-21 15:03:15 +01:00
mskold@mysql.com
043a16e34a
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-21 13:54:58 +01:00
msvensson@neptunus.(none)
e50d43b41a
Bug#14857 Reading dump files with single statement stored routines fails.Bug #14857 Reading dump files with single statement stored routines fails.
...
- Add tests, fixed by patch for 16878
2006-02-21 13:43:29 +01:00
msvensson@neptunus.(none)
c293324eb0
Bug#14871 mysqldump: invalid view dump output
...
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
2006-02-21 13:21:17 +01:00
andrey@lmy004.
85236db1f1
disable tests. failures happen from time to time and stop people from
...
pushing. the code needs to be more stable.
2006-02-21 13:07:25 +01:00
msvensson@neptunus.(none)
8e760bc6cc
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
751d625865
Merge neptunus.(none):/home/msvensson/mysql/bug17382/my51-bug17382
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 09:28:36 +01:00
pekka@mysql.com
73d75104af
ndb - enable ndb_dd_backuprestore
2006-02-21 09:27:20 +01:00
pekka@mysql.com
dfa0a58014
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-21 09:27:19 +01:00
tomas@poseidon.ndb.mysql.com
37826388e0
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-21 09:27:18 +01:00
tomas@poseidon.ndb.mysql.com
0bca0d435c
fixed test result on ndb_dd_restore whwas not done before
2006-02-21 09:25:50 +01:00
msvensson@neptunus.(none)
3764d3dab1
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:55:13 +01:00
msvensson@neptunus.(none)
ac336241b3
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
2006-02-21 08:54:08 +01:00
msvensson@neptunus.(none)
8d6ffa86e5
Merge neptunus.(none):/home/msvensson/mysql/bug2845/my51-bug2845
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 08:45:17 +01:00
msvensson@neptunus.(none)
674ee5987c
Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:44:27 +01:00
pekka@mysql.com
11a7a3ea63
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-21 05:08:18 +01:00
andrey@lmy004.
2453cd4e81
fixed result
2006-02-21 03:17:53 +01:00
andrey@lmy004.
0ba2425caf
fix for bug#16407 (EVENTS: sql_mode)
...
post-review fixes
2006-02-21 02:40:23 +01:00
pekka@mysql.com
54074472e5
ndb - fix event created by ndb_restore bug#17045 (not really)
2006-02-21 02:27:23 +01:00
andrey@lmy004.
a1fdeb1386
manual merge
2006-02-21 00:01:39 +01:00
andrey@lmy004.
22ba4ca3a3
fix for bug#16407 (Events: Changes in sql_mode won't be taken into account)
...
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)
2006-02-20 23:52:22 +01:00
andrey@lmy004.
7ef557ed49
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-20 23:29:55 +01:00
konstantin@mysql.com
07db5ac8b1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-vanilla
2006-02-20 23:00:50 +03:00
andrey@lmy004.
e5e7066e26
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-20 20:57:44 +01:00
konstantin@mysql.com
b58345d8c4
A new error message for deprecated statements.
...
Fixes failing sp.test
2006-02-20 22:51:32 +03:00
pekka@mysql.com
93db514db6
ndb - enable rpl_ndb_blob2 bug#17505
2006-02-20 17:20:54 +01:00
andrey@lmy004.
2996d95257
fix for bug #16411 Events: Microsecond intervals are allowed
...
WL#1034
2006-02-20 16:06:05 +01:00
msvensson@neptunus.(none)
40fca5ca11
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-20 15:06:18 +01:00
msvensson@neptunus.(none)
1119defd8f
Escape \ in "exec"
2006-02-20 15:03:16 +01:00
msvensson@neptunus.(none)
4cde1d1259
Bug#17382 mysql-test-run mysqldump fails with mysqlimport
2006-02-20 13:04:40 +01:00
pekka@mysql.com
6287081587
disabled.def: merge
2006-02-20 12:37:28 +01:00
tomas@poseidon.ndb.mysql.com
bb0b5cdbb1
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-20 12:37:26 +01:00
tomas@poseidon.ndb.mysql.com
82be07c41b
Bug #17559 ndb_gis test failure
...
- test tables use blobs without PK, and was not handled correctly
2006-02-20 12:36:10 +01:00
andrey@lmy004.
51f87cc655
fix the output. now only 1 space in PK definition
2006-02-20 11:20:31 +01:00
knielsen@mysql.com
ddc2da9c09
post-merge fixes.
2006-02-20 10:30:32 +01:00
knielsen@mysql.com
4fc82049c8
Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-20 09:52:22 +01:00