mats@mysql.com
8d10f7b7a1
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-03-07 10:00:13 +01:00
pem@mysql.com
a065843799
Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 19:46:17 +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
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
pekka@mysql.com
5d026c1d11
ndb - close non-bug rpl_ndb_charset Bug#17246
2006-03-06 13:51:57 +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
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
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)
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
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
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
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
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)
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
pem@mysql.com
9e001880df
Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 15:02:37 +01:00
bar@mysql.com
7dc12415e9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.b16316
2006-03-03 17:00:03 +04:00
msvensson@neptunus.(none)
e2827d97ea
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-03 13:33:01 +01:00
joerg@debian.(none)
e5b149d1e7
Merge joerg@trift2:/M50/patch-17595 into debian.(none):/M50/clone-5.0
2006-03-03 12:50:15 +01:00
gluh@mysql.com
ab67605976
Merge mysql.com:/home/gluh/MySQL/Merge/mysql-5.0-release
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-03 15:39:38 +04:00
gluh@eagle.intranet.mysql.r18.ru
f3e993d9a6
Fix for bug#17826 'type_decimal' fails with ps-protocol
...
removed unnecessary calculation of cache value
otherwise Join::preapre tries to calculate
undefined values(filed values)
2006-03-03 15:29:39 +04:00
pem@mysql.com
015ab71a50
Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 12:03:27 +01:00
msvensson@neptunus.(none)
5b9b34bd85
Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2
...
- Fix for ndb_gis to run with all types of logging
2006-03-03 11:52:52 +01:00
mats@mysql.com
e0f5d35ceb
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-03-03 09:57:42 +01:00
ramil@mysql.com
1a07140515
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b17615
2006-03-03 09:35:25 +04:00
cmiller@zippy.(none)
c672c119e3
Expanding a binary field should result in 0x00-filled positions, not 0x20
...
(ASCII space). For Bug#16857.
2006-03-02 20:49:10 -05:00
cmiller@zippy.(none)
5147bb8e9b
Expanding a binary field should result in 0x00-filled positions, not 0x20
...
(ASCII space). For Bug#16857.
2006-03-02 19:59:49 -05:00
andrey@lmy004.
c7837821e1
update test
2006-03-02 23:40:51 +01:00
SergeyV@selena.
1bacdef0a7
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#17595-mysql-5.0
2006-03-02 20:52:58 +03:00
msvensson@neptunus.(none)
d8153d4449
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-02 18:37:08 +01:00
andrey@lmy004.
42a93d2390
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17494
2006-03-02 16:25:05 +01:00
pem@mysql.com
d85e929547
Fixed BUG#17476: Stored procedure not returning data when it is called first
...
time per connection
Removed const_string() method from Item_string (it was only used in one
place, in a bad way). Defer possible SP variable, and access data directly
instead, in date_format item.
2006-03-02 14:54:04 +01:00