Commit graph

31562 commits

Author SHA1 Message Date
mats@mysql.com
3f7b8cfb6e Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/fix-mysql-5.1-new
2006-03-07 08:40:09 +01:00
mats@mysql.com
0713aa597a Bug#17874 (Test failure: rpl_row_basic_3innodb):
Some storage engines does not set the filler bits, so we set them
  before calling the record-reading functions.
2006-03-07 08:33:20 +01:00
pem@mysql.com
1e0289041c Merge mysql.com:/extern/mysql/bk/mysql-5.1-new
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 21:15:43 +01:00
msvensson@neptunus.(none)
6634aec877 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 20:24:21 +01:00
msvensson@neptunus.(none)
0acda1463d Update test result 2006-03-06 20:12:48 +01:00
msvensson@neptunus.(none)
aa3c00b5df Update test result 2006-03-06 20:09:16 +01:00
msvensson@neptunus.(none)
3ae351931d Update test result 2006-03-06 20:06:56 +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)
703d2f89d0 Build fix, liboptions.a is now a libtool convenience library
-liboptions.a -> liboptions.la
2006-03-06 17:17:22 +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
vtkachenko@quadxeon.mysql.com
efd3dad2d6 Merge bk-internal:/home/bk/mysql-5.1-new
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
2006-03-06 14:35:02 +01:00
vtkachenko@quadxeon.mysql.com
8c8d7b809b configure.in:
Change comment for fast-mutex
2006-03-06 14:25:18 +01:00
pekka@mysql.com
e05be757fe Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-03-06 14:18:35 +01:00
vtkachenko@quadxeon.mysql.com
9ae37a54f2 configure.in:
Change default value --with-fast-mutexes=no
2006-03-06 14:13:01 +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
kent@mysql.com
ab77867efb Merge 2006-03-06 13:50:52 +01:00
pekka@mysql.com
e6983ff205 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-03-06 13:44:03 +01:00
pekka@mysql.com
12c82da26c Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-dict
2006-03-06 13:34:53 +01: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)
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
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
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
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