mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47775 commits 2857 branches 349 tags 1.6 GiB
Commit graph

47775 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
04ea0c3357 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-17 22:05:33 +02:00
tomas@whalegate.ndb.mysql.com
8a08ac40fb correct test and result 2007-06-17 22:04:01 +02:00
tomas@whalegate.ndb.mysql.com
0d8c48da57 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:55:41 +02:00
tomas@whalegate.ndb.mysql.com
d20cc54cb8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-17 19:54:54 +02:00
tomas@whalegate.ndb.mysql.com
d1516ed29e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:53:43 +02:00
tomas@whalegate.ndb.mysql.com
8eb940de27 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
885ca40f37 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:48:51 +02:00
tomas@whalegate.ndb.mysql.com
6b8e7c9484 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:47:56 +02:00
tomas@whalegate.ndb.mysql.com
ff804bc546 Bug hpux11 ps_row warnings 
- do not print 701 dictionary busy error
 2007-06-17 19:47:20 +02:00
tomas@whalegate.ndb.mysql.com
baf9e764dc Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 19:30:09 +02:00
tomas@whalegate.ndb.mysql.com
1e7fdaabee Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-17 19:29:15 +02:00
tomas@whalegate.ndb.mysql.com
9c5183ace9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 19:28:01 +02:00
tomas@whalegate.ndb.mysql.com
9e3c14fae3 BUG#27640 
- correct test and result file
 2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
a61907f4fc Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 17:22:27 +02:00
tomas@whalegate.ndb.mysql.com
830be6deac Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 17:21:27 +02:00
tomas@whalegate.ndb.mysql.com
95ed412809 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 16:26:35 +02:00
istruewing@chilla.local
7d2fc98470 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-16 13:16:09 +02:00
istruewing@chilla.local
938fc3d66e Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-16 13:14:23 +02:00
istruewing@chilla.local
70600c15d8 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-16 11:34:21 +02:00
tomas@whalegate.ndb.mysql.com
8d31148899 Bug 
- handler binlog's must be shutdoem before logger.cleanup_base
 2007-06-16 11:16:02 +02:00
df@pippilotta.erinye.com
0cf4955ab4 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-16 06:41:59 +02:00
df@pippilotta.erinye.com
274bdc626d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-16 06:29:03 +02:00
df@pippilotta.erinye.com
872c090b83 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-16 06:19:47 +02:00
df@pippilotta.erinye.com
c8f14b1a0a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-16 06:17:19 +02:00
df@pippilotta.erinye.com
b2b965b534 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-16 06:16:00 +02:00
tsmith@quadxeon.mysql.com
891116551e binlog.result, binlog.test: 
Post-merge fix: replace xid=* with XID to isolate from number of transactions
 2007-06-15 23:57:53 +02:00
malff/marcsql@weblab.(none)
381deba387 Manual merge 2007-06-15 15:38:25 -06:00
iggy@alf.
e0adab8ce7 Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_winemb
 2007-06-15 14:45:44 -04:00
iggy@alf.
c15a2647a0 Embedded Server doesn't build on Windows. 
- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
 2007-06-15 14:32:16 -04:00
istruewing@chilla.local
9f6ea22b77 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-15 20:24:40 +02:00
istruewing@chilla.local
875cac1ffb Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-15 20:23:20 +02:00
malff/marcsql@weblab.(none)
7e36d37eb0 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-06-15 11:36:31 -06:00
istruewing@chilla.local
b64b1a56d6 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-15 19:23:29 +02:00
malff/marcsql@weblab.(none)
4b427bde82 Fixed warnings raised from mysqltest (unknown -- commands) 2007-06-15 11:15:22 -06:00
tsmith@maint1.mysql.com
9bc15db2d2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 19:07:59 +02:00
tsmith@maint1.mysql.com
3c331f6be9 Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 19:06:06 +02:00
malff/marcsql@weblab.(none)
e20232cf63 manual merge 2007-06-15 10:59:40 -06:00
tsmith@quadxeon.mysql.com
2095627468 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-15 18:58:07 +02:00
tsmith@maint1.mysql.com
a9ae34b56c Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 18:56:11 +02:00
tsmith@maint1.mysql.com
9f4134267a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 18:03:59 +02:00
tsmith@quadxeon.mysql.com
73035c274f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-15 17:59:04 +02:00
istruewing@chilla.local
f95d0b0f78 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:47:50 +02:00
istruewing@chilla.local
676ea58252 Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:47:02 +02:00
istruewing@chilla.local
dceae35549 Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-06-15 17:45:50 +02:00
mats@kindahl-laptop.dnsalias.net
43d419e9a9 Disabling test case awaiting reply 2007-06-15 17:21:56 +02:00
malff/marcsql@weblab.(none)
b80692b9ff Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-06-15 08:56:40 -06:00
istruewing@chilla.local
52200be6d0 Merge chilla.local:/home/mydev/mysql-4.1-amain 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-06-15 16:24:43 +02:00
cmiller@zippy.cornsilk.net
08ec6652bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-06-15 08:57:57 -04:00
mats@kindahl-laptop.dnsalias.net
3e2798fb37 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-15 14:23:25 +02:00