Commit graph

31516 commits

Author SHA1 Message Date
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
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
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
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
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
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
pekka@mysql.com
096ace92a6 ndb - bug#17761 blob tables patch 3a [requires next patch 3b] 2006-03-05 22:49:38 +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
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
paul@snake-hub.snake.net
f3c7e2d3ed mysqltest.c:
Better fix for do_sleep().
2006-03-03 13:57:49 -06: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
ingo@mysql.com
7d2af33057 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-03 15:44:02 +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
pem@mysql.com
48ca79adac 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 13:25:02 +01: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
pekka@mysql.com
dd24ab56d5 ndb - blob tables vs dict cache : patch 2 - bug#17761 (maybe) 2006-03-03 11:16:56 +01:00
ingo@mysql.com
85ae00c794 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug11527
2006-03-03 09:08:44 +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
kent@mysql.com
7ae10acbc4 mysql.spec.sh:
Don't create empty embedded RPM, bug#15769
2006-03-03 03:27:27 +01:00