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

9155 commits

Author SHA1 Message Date
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fd799cf6f5 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 16:26:34 -04:00
tomas@poseidon.ndb.mysql.com
590c8cfc1d disabled.def cleanup 2006-04-21 17:28:45 +02:00
tomas@poseidon.ndb.mysql.com
e38f6bc590 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 16:42:31 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fa3c74b420 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 09:30:05 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4d0a4e1199 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 08:57:53 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dc8a0bd64d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
 2006-04-21 08:55:01 -04:00
tomas@poseidon.ndb.mysql.com
fa21279e8e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 11:32:25 +02:00
igor@rurik.mysql.com
1afc70d03e Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2
 2006-04-20 17:00:29 -07:00
tomas@poseidon.ndb.mysql.com
c247d853ab diabled failing tests again 2006-04-21 01:59:22 +02:00
tomas@poseidon.ndb.mysql.com
8f9cc67841 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 01:53:44 +02:00
tomas@poseidon.ndb.mysql.com
cc138b5a3b Bug#18594 ndb_restore log boken in 5.1 
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1
 2006-04-21 01:51:58 +02:00
igor@rurik.mysql.com
0a65106cfb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-20 16:14:17 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a3f152cc6e Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
 2006-04-20 14:16:27 -04:00
pekka@mysql.com
a272f257c2 ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227 2006-04-20 18:53:23 +02:00
konstantin@mysql.com
f14040e4d8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-04-20 20:49:41 +04:00
igor@rurik.mysql.com
18149be57c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-20 07:24:34 -07:00
tomas@poseidon.ndb.mysql.com
6be87a41a2 added missing cleanup in test causing later test to fail 2006-04-20 15:28:31 +02:00
tomas@poseidon.ndb.mysql.com
5cec74c8de Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-20 12:06:14 +02:00
mskold@mysql.com
15ca6daf6f 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-04-20 11:11:21 +02:00
mats@mysql.com
4b605314e3 Bug#16993 (ALTER TABLE ADD col AUTO_INCREMENT does not replicate): 
Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.
 2006-04-20 08:56:47 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-19 21:22:35 -04:00
tomas@poseidon.ndb.mysql.com
697227c898 BUG#17400 enabled rpl_ndb_dd_partitions 2006-04-19 23:46:40 +02:00
tomas@poseidon.ndb.mysql.com
9d5429a3d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 22:46:01 +02:00
tomas@poseidon.ndb.mysql.com
65cee73399 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 19:56:52 +02:00
mats@mysql.com
5f763b4378 Disabling test that fails. There is already a bug for the failure. 2006-04-19 19:53:17 +02:00
igor@rurik.mysql.com
a6be98b8a8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-19 10:45:06 -07:00
konstantin@mysql.com
6d277eb89d Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-04-19 21:12:24 +04:00
mats@mysql.com
eee166d859 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-04-19 15:33:31 +02:00
mats@mysql.com
97f9cf23a8 Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly): 
This is not a bug. Enabling disabled test and adding comment.
 2006-04-19 15:29:49 +02:00
tomas@poseidon.ndb.mysql.com
0ebba697d8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 14:58:42 +02:00
tomas@poseidon.ndb.mysql.com
928514cf80 BUG#18094 Slave caches invalid table definition after atlters causes select failure 
- return correct object status from ndb dictionary
- check for validity of index retrieved from index, and retry if invalid
 2006-04-19 14:54:39 +02:00
monty@mysql.com
ed809462e9 Fixed timeing problem by ignoring failures and results from first select after table definition change 2006-04-19 12:21:33 +03:00
mats@mysql.com
04fc2d9eb8 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-04-19 10:58:44 +02:00
monty@mysql.com
f636a4d43c Only run test with row based logging 2006-04-19 11:20:11 +03:00
bar@mysql.com
a26f115a13 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 11:42:41 +05:00
bar@mysql.com
cedafc30e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 09:50:17 +05:00
bar@mysql.com
004854fbdd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-19 09:22:04 +05:00
mskold@mysql.com
a8d4eb8c34 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-04-18 09:00:02 +02:00
igor@rurik.mysql.com
e178ec2fc8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-17 16:40:16 -07:00
cmiller@zippy.(none)
61552172df Fixing a merge from a few days ago. 
Without a flush this test is nondeterministic for "row" binlog-format.
 2006-04-17 18:57:01 -04:00
pekka@mysql.com
4d1e38744d ndb - bug#16796 2006-04-17 20:24:41 +02:00
brian@zim.(none)
98f2cd4468 Fixed a few pieces around support for data directory. 2006-04-16 21:55:02 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
5dc6310712 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-15 09:47:33 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
d73e985ac1 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:50:32 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd868aecbb Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:48:27 -04:00
cmiller@zippy.(none)
c7513d482f Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-14 13:33:02 -04:00
cmiller@zippy.(none)
1d1040e1ea Hand-merged test. 2006-04-14 11:39:36 -04:00
cmiller@zippy.(none)
4671650387 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)
 2006-04-14 11:38:09 -04:00
bar@mysql.com
e75d52711a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-14 13:57:46 +05:00
bar@mysql.com
ed6899c64f Merge mysql.com:/usr/home/bar/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-14 13:34:18 +05:00