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

12423 commits

Author SHA1 Message Date
gkodinov@mysql.com
b519877c90 Bug #4981: 4.x and 5.x produce non-optimal execution path, 
3.23 regression test failure

The member SEL_ARG::min_flag was not initialized, 
due to which the condition for no GEOM_FLAG in function 
key_or did not choose "Range checked for each record" as 
the correct access method.
 2006-06-02 12:04:03 +03:00
mskold@mysql.com
a0cbfa6486 Merge mysql.com:/home/marty/MySQL/mysql-4.1 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-02 09:02:53 +02:00
aelkin@dl145h.mysql.com
bac6c908b6 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1
 2006-06-02 07:30:49 +02:00
mskold@mysql.com
39b50ce0d2 Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table 2006-06-02 07:26:45 +02:00
igor@rurik.mysql.com
3043d29b1f Post-merge fixes 2006-06-01 16:51:19 -07:00
aelkin@dl145h.mysql.com
930325b419 Merge dl145h.mysql.com:/tmp/andrei/MERGE/5.0_my 
into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1
 2006-06-01 22:32:33 +02:00
igor@rurik.mysql.com
f2719e8833 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-06-01 13:09:02 -07:00
cmiller@zippy.(none)
0754cb788b Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0
 2006-06-01 14:47:44 -04:00
elliot@mysql.com
a9ca1339d5 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
 2006-06-01 14:10:56 -04:00
elliot@mysql.com
b618bd3904 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
 2006-06-01 13:39:13 -04:00
jani@ua141d10.elisa.omakaista.fi
dea377fafc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new-marvel
 2006-06-01 20:39:12 +03:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
5e634e7d88 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-06-01 13:39:11 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
c4189c96b4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-06-01 12:28:34 -04:00
tomas@poseidon.ndb.mysql.com
eed7775dff Bug #18483 Cannot create table with FK constraint 
- remove error set for auto partitioned tables
 2006-06-01 14:51:58 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
19ef4bd6f6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-06-01 07:23:08 -04:00
tomas@poseidon.ndb.mysql.com
8195bfd7d2 this should not occur now after some other fixes w.r.t LOCK_open handeling in ndb and binlog 2006-06-01 12:59:39 +02:00
msvensson@shellback.(none)
6044b5a1f2 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-06-01 12:33:52 +02:00
anjuta@arthur.local
5459ebc572 Fixed Bug#19479:mysqldump creates invalid dump. 
Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
This allows to use table names with ":" on non windows platforms.
On Windows platform get an error if you use table name that contains FN_DEVCHAR
 2006-06-01 12:34:44 +03:00
tomas@poseidon.ndb.mysql.com
3ab132bdeb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-01 08:46:23 +02:00
mskold@mysql.com
fbe1319c28 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-01 08:43:47 +02:00
igor@rurik.mysql.com
d350bd9050 Post-merge fixes 2006-05-31 22:55:45 -07:00
igor@rurik.mysql.com
2fca3df452 Manual merge 2006-05-31 18:12:13 -07:00
igor@rurik.mysql.com
0585e50599 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-31 18:10:02 -07:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
31665cb561 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-05-31 18:24:34 -04:00
msvensson@devsrv-b.mysql.com
e5963d6a17 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
 2006-06-01 00:01:52 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
ff3d79bc7e Merge c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17310 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-05-31 14:08:58 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
f1337d3ef1 Merge c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20161 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-05-31 14:07:43 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
02b3293592 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
 2006-05-31 13:51:01 -04:00
aelkin@dl145k.mysql.com
5d8d38ee4c Bug#14157: utf8 encoding in binlog without set character_set_client 
adapting to pushbuild's custom to switch from default pathes. The name for
var directory must be set with MYSQLTEST_VARDIR.
 2006-05-31 19:49:38 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
fbd7a258e2 BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok 2006-05-31 13:32:14 -04:00
serg@sergbook.mysql.com
2e16f1eccc after review fixes 2006-05-31 18:07:32 +02:00
mskold@mysql.com
07189b3845 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new
 2006-05-31 16:16:04 +02:00
tomas@poseidon.ndb.mysql.com
b6f54a737a Bug #18947 CRBR: order in binlog of create table and insert (on different table) not determ 
- wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
+ some current_thd removals
+ enabling kill of sql thread during shema sync wait
 2006-05-31 16:16:03 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
9686e7bfc9 BUG#20161: LINEAR keyword on subpartitions not displayed in information schema for partitions 
and in SHOW CREATE TABLE
 2006-05-31 09:33:10 -04:00
mskold@mysql.com
8cd139c27a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-05-31 15:32:49 +02:00
serg@sergbook.mysql.com
4accfd2968 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
 2006-05-31 15:07:29 +02:00
mskold@mysql.com
4532eb14e3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new
 2006-05-31 14:38:20 +02:00
jani@ua141d10.elisa.omakaista.fi
04441d04b1 Merge from 5.0 to 5.1. Third part with fixes. 2006-05-31 14:55:28 +03:00
jani@ua141d10.elisa.omakaista.fi
a0a7573e02 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new-marvel
 2006-05-31 14:18:12 +03:00
aelkin@dl145k.mysql.com
e9570047a4 BUG#14157: utf8 encoding in binlog without set character_set_client 
missed table to drop after merge from 4.1
 2006-05-31 12:51:21 +02:00
aelkin@dl145k.mysql.com
87c935fe48 Merge dl145k.mysql.com:/tmp/andrei/MERGE/mysql-4.1 
into  dl145k.mysql.com:/tmp/andrei/MERGE/5.0
 2006-05-31 10:47:16 +02:00
msvensson@shellback.(none)
abf422cd0e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-05-31 10:33:38 +02:00
serg@sergbook.mysql.com
a1b9c3a1ed proper cleanup after the test 2006-05-31 10:30:48 +02:00
mskold@mysql.com
c11887c49b Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database 2006-05-31 10:28:42 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9bf4fd5e9b Merge from 5.0 2006-05-31 11:18:58 +03:00
gbichot@dl145j.mysql.com
5b33d510a4 Merge gbichot@bk-internal:/home/bk/mysql-5.1-new 
into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
 2006-05-31 09:02:02 +02:00
acurtis@xiphis.org
0cd7ac833a Bug#19648 
"Merge table does not work with bit types"
   MERGE should have HA_CAN_BIT_FIELD feature bit set or else table row is
   formatted incorrectly.
 2006-05-30 17:10:53 -07:00
ngrishakin@mysql.com
0774b37d2b disabled.def with ndb_dd_backuprestore test disabled 2006-05-30 23:21:44 +02:00
evgen@moonbone.local
fdc2b921cc item_cmpfunc.cc, func_in.result, multi_update.result: 
After merge fix
 2006-05-30 23:05:34 +04:00
serg@sergbook.mysql.com
7135b559ab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
 2006-05-30 18:24:06 +02:00