mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34999 commits 2791 branches 343 tags 1.7 GiB
Commit graph

12311 commits

Author SHA1 Message Date
mats@mysql.com
da98424d6c Replication/Backup Team Tree test fixing. 2006-06-19 09:25:49 +02:00
mats@mysql.com
a424aa339e Fixes in tests for Replication/Backup Team Tree. 2006-06-16 11:10:37 +02:00
lars@dl145k.mysql.com
3d1fe89803 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-16 02:44:23 +02:00
lars@mysql.com
5f37fc4a76 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-16 01:15:19 +02:00
mats@mysql.com
fc93c5a99e Various fixes to allow tests to pass. 2006-06-15 16:53:12 +02:00
igor@rurik.mysql.com
88b0e989b6 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-06-14 20:00:36 -07:00
acurtis@ltamd64.xiphis.org
2b02a2aa2e Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  xiphis.org:/home/antony/work2/p2-bug20168.4
 2006-06-14 19:37:21 -07:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
3e0cfd1ba1 merge fixes 2006-06-14 22:37:20 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
d02f358a11 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
 2006-06-14 22:32:41 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
fea2fa6239 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
 2006-06-14 19:41:33 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
67e6e8b423 merge update 2006-06-14 19:40:06 -04:00
acurtis@xiphis.org
13ded6a6ca Merge xiphis.org:/home/antony/work2/p2-bug20168.2 
into  xiphis.org:/home/antony/work2/p2-bug20168.4
 2006-06-14 13:12:19 -07:00
tomas@poseidon.ndb.mysql.com
2746b73968 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
 2006-06-14 22:12:18 +02:00
tomas@poseidon.ndb.mysql.com
49b9b9a017 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-14 20:38:52 +02:00
tomas@poseidon.ndb.mysql.com
01046bb756 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-14 20:25:51 +02:00
tomas@poseidon.ndb.mysql.com
2fcf737feb Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL 
- make sure to disable bulk insert when check for duplicate key is needed
 2006-06-14 20:16:32 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
8484ea8b04 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
 2006-06-14 09:22:27 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
e91454f89e Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
 2006-06-14 09:12:07 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
b51515c998 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801
 2006-06-14 08:51:39 -04:00
mskold@linux.site
274a23a95c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-14 13:45:27 +02:00
tomas@poseidon.ndb.mysql.com
0ecea73c32 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-14 13:45:26 +02:00
tomas@poseidon.ndb.mysql.com
7f026f3afc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-14 12:23:30 +02:00
tomas@poseidon.ndb.mysql.com
bdc7a1b759 Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to corrupt 
- add infinite retry on drop table temporary error
 2006-06-14 12:21:18 +02:00
mskold@mysql.com
de28afe25b Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): added test case 2006-06-14 11:38:55 +02:00
gluh@eagle.intranet.mysql.r18.ru
0a141d6db3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/home/gluh/MySQL/Merge/5.1
 2006-06-14 13:53:30 +05:00
gluh@eagle.intranet.mysql.r18.ru
00a1b6857a after merege fix 2006-06-14 13:52:16 +05:00
msvensson@neptunus.(none)
644bbd6725 Update test result to 5.1 format 2006-06-14 10:23:08 +02:00
gluh@mysql.com
a1020c6e4d post-merge fix 2006-06-14 10:54:56 +05:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
02c25f8055 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
 2006-06-13 22:41:48 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
05703aea88 BUG#19307: 
Removed non-static test case
 2006-06-13 22:40:05 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
6d519a2370 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
 2006-06-13 21:41:02 -04:00
mats@mysql.com
95b1c019b8 Bug#19066 (DELETE FROM replication inconsistency for NDB): 
Fixing result files for tests.
 2006-06-13 22:10:01 +02:00
mats@mysql.com
8d97b5f855 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/b19066-mysql-5.1-new
 2006-06-13 22:09:59 +02:00
cmiller@zippy.(none)
00243ac847 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-06-13 16:06:35 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
59c0034061 BUG#19307: CSV engine can cause crashes in partitioned tables (due to its conversion of NULLs to 0) 2006-06-13 14:36:23 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
d2b04770ac Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
 2006-06-13 11:44:43 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
c2f0bd70b5 fixed test case 2006-06-13 11:32:07 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
192033c7a2 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
 2006-06-12 17:49:38 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
44076b96a1 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
 2006-06-12 17:41:05 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
30817b8900 BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE ADD/DROP/REORGANIZE partitions 
After review fix
 2006-06-12 17:30:32 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
334a28f9f5 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
 2006-06-12 14:50:46 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
744bb5d7bb Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695
 2006-06-12 14:42:07 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
9aa3af6723 Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305
 2006-06-12 14:31:25 -04:00
acurtis@xiphis.org
32fbbbb9b6 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/p2-bug20168.2
 2006-06-12 06:53:31 -07:00
mskold@mysql.com
ae70201afb Added order by 2006-06-12 15:28:36 +02:00
mskold@mysql.com
38a445fee1 sql_delete.cc: 
Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
Many files:
  Bug #18864  TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
ndb_lock.result, ha_ndbcluster.cc:
  Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
NdbDictionaryImpl.hpp:
  Fix of bad merge
 2006-06-12 14:23:21 +02:00
mskold@mysql.com
be60898441 Merge mysql.com:/home/marty/MySQL/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-12 11:34:00 +02:00
mskold@mysql.com
d17c3d3c7c Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans 2006-06-12 10:40:56 +02:00
mskold@mysql.com
b93ba41e68 Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-12 09:42:20 +02:00
mskold@mysql.com
b89f17912c Added lock test on index scan 2006-06-12 09:28:27 +02:00