mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34976 commits 2785 branches 343 tags 1.6 GiB
Commit graph

34976 commits

This branch
This branch
All branches
Author SHA1 Message Date
petr@outpost.site
2210731ea4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-15 15:04:52 +04:00
petr@mysql.com
cde3d7d886 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-15 14:53:11 +04:00
mskold@mysql.com
32c45f9209 Fixed typo in variable name 2006-06-15 11:59:21 +02:00
mskold@mysql.com
7636df8649 Removed stray bracket 2006-06-15 11:40:53 +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
47271c6bb1 Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL 
- correction of backport error
 2006-06-14 20:22:03 +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
joerg@trift2.
9b79108e96 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into mysql.com:/M51/bug18810-5.1
 2006-06-14 18:20:33 +02:00
joerg@trift2.
075bb7faf2 Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1 2006-06-14 18:16:35 +02:00
joerg@mysql.com
6448fca67a Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 2006-06-14 18:13:36 +02:00
joerg@mysql.com
054cc44ede support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 2006-06-14 16:54:54 +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
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
ac0354c783 BUG#19801: Problems with single partition with only NULL allowed in LIST partitioning 
After review fix
 2006-06-14 08:35:19 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
2dd6099092 BUG#16002: Unsigned partition function support 
After review fix
 2006-06-14 08:31:38 -04:00
mskold@mysql.com
61788c74da Fixed variable description 2006-06-14 14:13:45 +02:00
mskold@linux.site
c70ed99f48 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:30 +02:00
svoj@may.pils.ru
5d4b5deae1 After merge fix. 2006-06-14 16:45:29 +05:00
svoj@may.pils.ru
64bcd2cc11 Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.0-merge 
into  may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.1
 2006-06-14 16:45:28 +05: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
msvensson@neptunus.(none)
4ec47c9c73 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/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
2f6a4ad3c2 corrected merge error 2006-06-14 13:32:29 +02:00
tomas@poseidon.ndb.mysql.com
8af1a075a6 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 13:10:12 +02:00
tomas@poseidon.ndb.mysql.com
88373a025a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-06-14 13:00:15 +02:00
tomas@poseidon.ndb.mysql.com
7e2323ed7e 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:54:28 +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
5660fa6b46 Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster): psot review comment: cleared flag before checking 2006-06-14 12:01:06 +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
mskold@mysql.com
a6ebed7cea Added flag to detect renaming of fields (not supported as fast alter table for ndbcluster) 2006-06-14 11:08:36 +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
tomas@poseidon.ndb.mysql.com
c30e79165b 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 04:41:49 +02: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
tomas@poseidon.ndb.mysql.com
2d33bb5c94 ndb: add missing LOCK_open 2006-06-14 01:20:39 +02:00