database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity
35,048 Commits 3,150 Branches 363 Tags
95aa9c28f247cb28d13e8966c706ca60d2efdf1b
Commit Graph

9856 Commits

Author SHA1 Message Date
stewart@mysql.com
45d7e75cb7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
 2006-06-16 18:54:20 +10:00
serg@serg.mylan
ce07f4b903 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 23:50:31 +02:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
5d2d3a53c9 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
 2006-06-15 17:50:30 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
c8da9ebda3 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/bug20397
 2006-06-15 16:00:54 -04:00
gluh@eagle.intranet.mysql.r18.ru
00fcdf8c00 Fix for bug#19667 group by a decimal expression yields wrong result 2006-06-15 16:24:02 +05:00
serg@serg.mylan
03a80df345 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 11:59:50 +02:00
ingo@mysql.com
2b6b5b6360 Merge mysql.com:/home/mydev/mysql-5.0-amerge 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-15 10:58:02 +02:00
serg@serg.mylan
22bb0263d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 08:27:50 +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
serg@serg.mylan
a2bb34ce8d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 04:37:21 +02: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
0c805b3f0d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-14 20:27:32 +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
serg@serg.mylan
7549dac044 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-14 19:46:52 +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
serg@serg.mylan
90e3ff1eb5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-14 13:57:17 +02: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
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
serg@serg.mylan
ebd20550f6 move --disable_warnings where it belongs 2006-06-14 10:04:30 +02:00
serg@serg.mylan
2d8f78e402 Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index 
Don't rely on table->null_row when no index is used - it may be a multi-table
 2006-06-14 09:19:02 +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
32ac7da6a3 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/bug20397
 2006-06-13 23:08:06 -04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
975e14e40d BUG#20397: Crash at ALTER TABLE t1 engine = x; for partitioned table 2006-06-13 22:46:38 -04: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
pekka@clam.ndb.mysql.com
e071bbcb0b ndb - bug#20406 multi-platform testing - not FIX 2006-06-14 00:38:34 +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
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
gkodinov@mysql.com
df358201e8 Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B20363
 2006-06-12 18:28:04 +03:00
gkodinov@mysql.com
eb693dcc7b Bug #20363: Create view on just created view is now denied 
There was a wrong determination of the DB name (witch is 
not always the one in TABLE_LIST because derived tables
may be calculated using temp tables that have their db name
set to "").
The fix determines the database name according to the type 
of table reference, and calls the function check_access() 
with the correct db name so the correct set of grants is found.
 2006-06-12 18:15:08 +03:00