Commit graph

31748 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
dfe158fc15 Use grep instead of egrep
Use system inestad of exec
2006-03-06 21:45:13 +01:00
msvensson@neptunus.(none)
394da857fd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-06 21:36:57 +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
serg@serg.mylan
d190e08e4e merged 2006-03-06 20:53:14 +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
kent@mysql.com
de821aa76f 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 18:57:32 +01: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)
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
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
cmiller@zippy.(none)
b65fbcbc99 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-06 10:49:33 -05:00
cmiller@zippy.(none)
a2a5925d60 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
2006-03-06 10:44:01 -05:00
kent@mysql.com
590d258165 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 15:00:44 +01:00
kent@mysql.com
16933400fc mysql.spec.sh:
Enabled fast mutexes, now default is off
2006-03-06 14:57:41 +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
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
kent@mysql.com
ab77867efb Merge 2006-03-06 13:50:52 +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
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
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
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