petr@mysql.com
0e853c79b7
Fix Bug#17600: Invalid data logged into mysql.slow_log
...
Recommit with post-review fixes.
2006-03-06 21:03:17 +03:00
serg@serg.mylan
e7504b3468
merged
2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be
kill (subquery) - three years old bugfix that never worked
2006-03-06 18:26:39 +01:00
mskold@mysql.com
6feaef7517
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 18:08:42 +01:00
mskold@mysql.com
48cc86db83
Tables are now removed remotely by binlog_thread
2006-03-06 18:06:21 +01:00
msvensson@neptunus.(none)
77214de820
Disable rpl_ndb_multt_update2
2006-03-06 17:09:23 +01:00
holyfoot@mysql.com
8707e3356d
Merge mysql.com:/home/hf/work/mysql-5.0.15745
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-06 19:57:20 +04:00
msvensson@neptunus.(none)
6457050df6
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 14:52:49 +01:00
msvensson@neptunus.(none)
c9d14a0329
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 14:03:16 +01:00
msvensson@neptunus.(none)
30071e9783
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 14:01:15 +01:00
pekka@mysql.com
5d026c1d11
ndb - close non-bug rpl_ndb_charset Bug#17246
2006-03-06 13:51:57 +01:00
msvensson@neptunus.(none)
108fc10143
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 13:45:53 +01:00
bar@mysql.com
6823225a81
Merge mysql.com:/usr/home/bar/mysql-4.1.b15949
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-03-06 16:20:15 +04:00
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
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
gluh@mysql.com
69e8b9d06e
4.1 -> 5.0 merge
2006-03-06 14:38:31 +04: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
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
holyfoot@deer.(none)
a920d0df86
bug #15745 (COUNT(DISTINCT CONCAT(x,y)) returns wrong result
2006-03-05 20:48:31 +04: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
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
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
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
pem@mysql.com
2b6f510350
Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
2006-03-03 19:18:17 +01:00
paul@snake-hub.snake.net
6fa488114d
mysql-stress-test.pl, README.stress:
...
Revise stress-test README
2006-03-03 12:15:01 -06:00
pem@mysql.com
b66567f619
Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-release
2006-03-03 18:51:13 +01:00
msvensson@neptunus.(none)
3c2221b54d
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-03 15:44:38 +01:00
bar@mysql.com
f516d1f9f2
Bug#16318: XML: extractvalue() incorrectly returns last() = 1
...
xml.result, xml.test:
Adding test case.
item_xmlfunc.cc:
- adding "size" member into MY_XPATH_FLT struct,
to pass parent's context size when iterating
in a predicate. Previously, temporaty context
size was calculated instead, which is always 1.
As a result, things like last() and count()
didn't work fine.
- adding iteration into Item_func_xpath_elementbyindex:
similar to Item_func_xpath_predicate.
This is to make things like last() and count()
work inside square brackets.
2006-03-03 18:36:14 +04:00
msvensson@neptunus.(none)
b56857d152
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-03 15:13:10 +01:00
msvensson@neptunus.(none)
4e55197ce3
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-03 15:02:46 +01:00