mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47546 commits 2778 branches 343 tags 1.6 GiB
Commit graph

47546 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 #28949 
- 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
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
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
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
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
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
ramil/ram@ramil.myoffice.izhnet.ru
934ad9e82a Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/mysql-5.1-maint
 2007-06-15 14:30:13 +05:00
df@pippilotta.erinye.com
a78502b254 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-15 11:28:55 +02:00
df@pippilotta.erinye.com
c64fca9e24 follow-up fix 2007-06-15 11:28:15 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
44c3524026 Backport of 
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1
 2007-06-15 13:53:36 +05:00
df@pippilotta.erinye.com
c4262055d6 BUG#27861 merge to 5.1 2007-06-15 09:52:58 +02:00
df@pippilotta.erinye.com
edd001475f 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-15 09:47:25 +02:00
df@pippilotta.erinye.com
973c541b5c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-06-15 09:36:05 +02:00
df@pippilotta.erinye.com
ec40b58aca Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-06-15 09:33:09 +02:00
georg@bing.site
7c02fbd147 Added yassl and taocrypt sources to mysqlclientlib 2007-06-15 09:18:58 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
f28a584287 Additional fix for bug N26402: 
An attempt to open file with name '????????.frm'
can produce different errors:
- ER_NO_SUCH_TABLE on Unix
- ER_FILE_NOT_FOUND on Windows
because QUESTION MARK has special meaning on Windows.
Make sure that any of these two errors happens.
 2007-06-15 11:53:46 +05:00
bar@bar.myoffice.izhnet.ru
615297df8b Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
 2007-06-15 11:27:10 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
caf85332ba Bug#28862 Extended Latin1 characters get lost in CVS engine 
Problem: Temporary buffer which is used for quoting and escaping
  was initialized to character set utf8, and thus didn't allow
  to store data in other character sets.
  Fix: changing character set of the buffer to be able to
  store any arbitrary sequence of bytes.
 2007-06-15 11:19:35 +05:00
dkatz@damien-katzs-computer.local
3a1a561322 Merge damien-katzs-computer.local:/Users/dkatz/mysql51 
into  damien-katzs-computer.local:/Users/dkatz/51_win
 2007-06-14 20:48:11 -04:00
tsmith@maint1.mysql.com
664fa012c0 Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 02:36:37 +02:00
tsmith@quadxeon.mysql.com
918090030b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
 2007-06-15 01:57:33 +02:00
antony@ppcg5.local
21c233440d Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6 
into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
 2007-06-14 16:04:52 -07:00
cmiller@zippy.cornsilk.net
85caa3540e 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-14 18:17:26 -04:00
tsmith@quadxeon.mysql.com
87fdad4ce8 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-14 23:23:30 +02:00
mskold/marty@linux.site
2b2bdf74a3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-06-14 21:57:30 +02:00
joerg@trift2.
5b22180586 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-14 21:45:39 +02:00
joerg@trift2.
9ab46d0088 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-14 21:34:41 +02:00
joerg@trift2.
b5c9cab55c Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-14 21:27:33 +02:00
joerg@trift2.
ae1ff2e84c Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-14 21:25:10 +02:00