msvensson@neptunus.(none)
fd47e2d19c
BUG#10460 SHOW CREATE TABLE uses inconsistent upper/lower case
...
- Fix result files
2006-03-06 12:58:54 +01:00
gluh@mysql.com
7f4b27cf29
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:58:16 +04:00
msvensson@devsrv-b.mysql.com
ee97bebc8c
Merge bk-internal:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:28:30 +01:00
msvensson@neptunus.(none)
6ffe593ddc
Fix merge error, missing "," in result file
2006-03-06 12:21:42 +01:00
kent@mysql.com
ff71af1e01
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 12:21:10 +01:00
kent@mysql.com
dfae81d014
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 12:15:26 +01:00
gluh@mysql.com
321eb3dce6
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:15:23 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3ce98d2c9
post-merge fix
2006-03-06 15:14:15 +04:00
msvensson@devsrv-b.mysql.com
2660607096
Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:04:54 +01:00
msvensson@neptunus.(none)
3f935b2777
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 12:00:51 +01:00
msvensson@neptunus.(none)
e4705ea4bf
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 11:51:46 +01:00
mskold@mysql.com
7d7da8876d
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-03-06 11:51:24 +01:00
bar@mysql.com
e019d60536
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15949
2006-03-06 14:50:34 +04:00
msvensson@neptunus.(none)
40b3222b74
Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 11:39:36 +01:00
kent@mysql.com
8da2410a91
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 11:39:34 +01:00
gluh@mysql.com
69e8b9d06e
4.1 -> 5.0 merge
2006-03-06 14:38:31 +04:00
kent@mysql.com
aec8d2a897
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 11:33:47 +01:00
mskold@mysql.com
def9e36fea
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-03-06 11:25:47 +01:00
pekka@mysql.com
7ca7705b3b
ndb - bug#17761 blob tables patch 3b [closes the bug]
2006-03-06 11:15:23 +01:00
gluh@eagle.intranet.mysql.r18.ru
f1eaf7e8ec
Fix for bug#14385 GRANT and mapping to correct user account problems
...
Check if the host of table hash record exactly matches host from GRANT command
2006-03-06 14:03:40 +04:00
pekka@mysql.com
710326f1da
ndb - enable rpl_ndb_charset Bug#17246 for test
2006-03-06 10:57:57 +01:00
mskold@mysql.com
92eb0acd26
Added test for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported
2006-03-06 10:55:44 +01:00
timour@mysql.com
593bd1d3b8
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-15229
2006-03-06 11:41:19 +02:00
mskold@mysql.com
a34be87ff3
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-03-06 10:30:36 +01:00
mskold@mysql.com
7380a4dd22
Fix for Bug#17888 DD: ADD INDEX causes error 756 'Index on disk column is not supported
2006-03-06 10:24:06 +01:00
gluh@eagle.intranet.mysql.r18.ru
33e7d20f37
Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
...
calculate Item_func_format::max_length using charset->mbmaxlen
2006-03-06 12:52:38 +04:00
pekka@mysql.com
096ace92a6
ndb - bug#17761 blob tables patch 3a [requires next patch 3b]
2006-03-05 22:49:38 +01:00
holyfoot@deer.(none)
a920d0df86
bug #15745 (COUNT(DISTINCT CONCAT(x,y)) returns wrong result
2006-03-05 20:48:31 +04:00
konstantin@mysql.com
519ea6a278
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-03-05 12:04:03 +03:00
reggie@big_geek.
bb649ca4bb
Merge reggie@linux:/home/reggie/work/mysql-5.1
...
into big_geek.:C:/Work/mysql/mysql-5.1-bug17720
2006-03-04 16:16:15 -06:00
konstantin@mysql.com
1a4523e235
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-03-05 01:11:24 +03:00
konstantin@mysql.com
7a86eebb03
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-03-05 00:59:43 +03:00
konstantin@mysql.com
2ea0b9b72c
Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":
...
it breaks binary compatibility. The patch will be left intact
in 5.1.
2006-03-05 00:38:54 +03:00
dlenev@mysql.com
0fb4a6645e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2006-03-04 23:58:48 +03:00
reggie@big_geek.
97a4671f1f
Bug #17720 Partition ALTER TABLE fails on rename of .MYI file
...
Fix this by passing the HA_EXTRA_PREPARE_FOR_DELETE onto the newly added or about to be dropped partitions
so they have an opportunity to close their OS file handle.
2006-03-04 14:21:27 -06:00
konstantin@mysql.com
40b368af16
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2006-03-04 22:33:19 +03:00
dlenev@mysql.com
efe0900669
Fix for bug #17866 "Problem with renaming table with triggers with fully
...
qualified subject table" which was introduced during work on bug #13525
"Rename table does not keep info of triggers".
The bug was caused by the fact that during reconstruction of CREATE TRIGGER
statement stored in .TRG file which happened during RENAME TABLE we damaged
trigger definition in case when it contained fully qualified name of subject
table (see comment for sql_yacc.yy for more info).
2006-03-04 16:55:06 +03:00
ingo@mysql.com
c5a638cee0
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug11527
2006-03-04 14:06:52 +01:00
ingo@mysql.com
ec45217cc4
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug11527
2006-03-04 11:40:54 +01:00
petr@mysql.com
965fd06afa
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/devel/5.1-cleanup
2006-03-04 11:52:02 +03:00
petr@mysql.com
0a861ec8c5
Remove unused thd->options's flag -- OPTION_UPDATE_LOG
...
The update log itself was removed back in 5.0. Recommit
with post-review fixes.
2006-03-04 11:20:56 +03:00
reggie@big_geek.
653596ce1f
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into big_geek.:C:/Work/mysql/mysql-5.1
2006-03-03 22:09:20 -06:00
reggie@big_geek.
3bcc20950d
Some cmake script fixes
2006-03-03 22:05:40 -06:00
cmiller@zippy.(none)
e5e1760292
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-03 16:27:43 -05:00
cmiller@zippy.(none)
599c710a5b
Bug#16859 involves truncating column data at NUL characters. Instead, the
...
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
2006-03-03 16:26:38 -05:00
paul@snake-hub.snake.net
33dfa2a91e
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-03-03 14:59:29 -06:00
paul@snake-hub.snake.net
a690cbf326
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
2006-03-03 14:50:41 -06:00
paul@snake-hub.snake.net
53ea1584bc
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1-clone
2006-03-03 14:41:55 -06:00
paul@snake-hub.snake.net
1442be9798
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-03-03 14:37:43 -06:00
paul@snake-hub.snake.net
f3cf52832d
mysqltest.c:
...
Typos.
2006-03-03 14:34:30 -06:00