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
47671 commits 2778 branches 343 tags 1.6 GiB
Commit graph

18402 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
6a51e0f8a2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-18 23:55:48 +02:00
tomas@whalegate.ndb.mysql.com
55c6e7b142 check for different error message 2007-06-18 17:57:16 +02:00
tomas@whalegate.ndb.mysql.com
1c15d3e1a1 fixes Bug #25305 (and several other similar test tailures with the same symptom) 
- make tests wait until ndb connects properly
 2007-06-18 15:36:10 +02:00
mats@kindahl-laptop.dnsalias.net
07774f97e5 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-18 12:44:21 +02:00
lars/lthalmann@dl145h.mysql.com
a2d93c53db Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 12:10:36 +02:00
mats@kindahl-laptop.dnsalias.net
5e4137730c Fixes to make team-tree green. 2007-06-18 11:29:32 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 09:42:22 +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
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
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
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
mats@kindahl-laptop.dnsalias.net
43d419e9a9 Disabling test case awaiting reply 2007-06-15 17:21:56 +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
mats@kindahl-laptop.dnsalias.net
9f5b594b8a Fixing typo in test case. 2007-06-15 09:32:54 +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
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
7b99f8a0fc 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 19:08:46 +02:00
tomas@whalegate.ndb.mysql.com
0da2eb5ce3 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-14 18:43:29 +02:00
tomas@whalegate.ndb.mysql.com
ad81e83c70 Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed" 
- correction, missing node id
 2007-06-14 18:40:32 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
160add01a5 fix the binlog-stm_ps.test for the embedded-server 2007-06-14 20:33:57 +05:00
mskold/marty@linux.site
c487c38111 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 16:10:11 +02:00
mats@kindahl-laptop.dnsalias.net
a6e2763853 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
 2007-06-14 15:48:32 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ad88a849c8 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
 2007-06-14 20:45:12 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
27430cd10b Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
 2007-06-14 20:30:48 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
04931cfcd6 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
 2007-06-14 19:57:50 +08:00
holyfoot/hf@hfmain.(none)
1e9373fd60 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-06-14 16:41:10 +05:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
51fe11b494 Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed" 2007-06-14 19:40:44 +08:00
holyfoot/hf@hfmain.(none)
76e0a0768a Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-06-14 16:35:20 +05:00
mats@kindahl-laptop.dnsalias.net
0341be4eb3 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Temporarily using thd_tx_isolation() until decision is made on how to
get the isolation level.
 2007-06-14 13:33:31 +02:00
svoj@june.mysql.com
d122a8caf7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-14 16:28:34 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
6d2ffe7b8e Bug#26402 Server crashes with old-style named table 
Problem: crash on attempt to open a table
  having "#mysql50#" prefix in db or table name.
  Fix: This prefix is reserved for "mysql_upgrade"
  to access 5.0 tables  whose file names are not encoded
  according to "5.1 tablename to filename encoded".
  Don't try open tables whose db name or table name
  has this prefix.
 2007-06-14 16:28:33 +05:00
svoj@june.mysql.com
09cd5b5ef8 Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-14 16:19:47 +05:00
svoj@mysql.com/june.mysql.com
01c9419cec BUG#26976 - Missing table in merge not noted in related error msg + 
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.
 2007-06-14 16:18:01 +05:00
tomas@whalegate.ndb.mysql.com
b2aa8dd4d3 Bug #29103 ndb_restore segfaults on NULL var[char|binary] 2007-06-14 12:51:13 +02:00
gkodinov/kgeorge@magare.gmz
2372767bbd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28991-5.1-opt
 2007-06-14 12:54:52 +03:00
gkodinov/kgeorge@magare.gmz
56290f2690 Bug #28991: rpl_events failure in pushbuild 
In tests waiting on a timeout is not deterministic enough
to make sure that an event actually finished executing.
Fixed the test by waiting in a loop and checking the effect
that the event is supposed to produce.
 2007-06-14 12:53:13 +03:00
mats@kindahl-laptop.dnsalias.net
61ac88f313 WL#3303 (RBR: Engine-controlled logging format): 
Test case fixes.
 2007-06-14 11:05:48 +02:00
dkatz@damien-katzs-computer.local
7a303bc80e Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-06-13 16:37:16 -04:00
dkatz@damien-katzs-computer.local
471173c57c Bug #28953 Using events in a replication let the slave crash. 
Fixed where the slave code would try to update the Lex->sphead which is NULL on an "alter table" commands.
 2007-06-13 16:24:21 -04:00
dkatz@damien-katzs-computer.local
c67c49fff0 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50_win
 2007-06-13 15:47:34 -04:00
dkatz@damien-katzs-computer.local
1481bfc87b Bug #28897 UUID() returns non-unique values when query cache is enabled 
Removed the ability to cache queries containing "UUID()".
 2007-06-13 14:23:25 -04:00