mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35204 commits 2857 branches 349 tags 1.6 GiB
Commit graph

35204 commits

Author SHA1 Message Date
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
a49ab68975 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19067
 2006-06-03 12:57:32 -04:00
serg@serg.mylan
f02227cbad Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-03 09:21:19 +02:00
igor@rurik.mysql.com
f1afd17821 Cleanup for the fix of bug 18206. 2006-06-02 19:15:32 -07:00
igor@rurik.mysql.com
5ade9e75dc Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-02 17:06:10 -07:00
sergefp@mysql.com
995bb87d9c get_[part_]partition_id(): Fix function comments. 2006-06-03 04:03:26 +04:00
serg@serg.mylan
f74431277f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-02 23:23:02 +02:00
igor@rurik.mysql.com
d02f254eaa Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
 2006-06-02 14:16:22 -07:00
igor@rurik.mysql.com
37e049db01 Fixed bug . 
The bug report revealed two problems related to min/max optimization:
1. If the length of a constant key used in a SARGable condition for
for the MIN/MAX fields is greater than the length of the field an 
unwanted warning on key truncation is issued;
2. If MIN/MAX optimization is applied to a partial index, like INDEX(b(4))
than can lead to returning a wrong result set.
 2006-06-02 14:14:57 -07:00
guilhem@mysql.com
7921811e1f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-new-WL3146-handler
 2006-06-02 22:22:59 +02:00
guilhem@mysql.com
a4e778f34d First push for WL#3146 "less locking in auto_increment". It is a 0-real-change patch. 
New prototype for get_auto_increment() (but new arguments not yet used), to be able
to reserve a finite interval of auto_increment values from cooperating engines.
A hint on how many values to reserve is found in handler::estimation_rows_to_insert,
filled by ha_start_bulk_insert(), new wrapper around start_bulk_insert().
NOTE: this patch changes nothing, for all engines. But it makes the API ready for those
engines which will want to do reservation.
More csets will come to complete WL#3146.
 2006-06-02 22:21:32 +02:00
kent@mysql.com
4cc58e7ff2 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/mysql-5.0
 2006-06-02 21:41:57 +02:00
anna@hasky.mysql.fi
16a31b390b Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hasky.mysql.fi:/home/anjuta/my/mysql-5.0-clean
 2006-06-02 22:31:51 +03:00
anjuta@arthur.local
bd8eef5647 BUG#19363: mysql --no_pager makes core dump. 
The problem was missing break; operator.
 2006-06-02 22:03:39 +03:00
serg@serg.mylan
c972a86663 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-02 20:11:36 +02:00
serg@serg.mylan
ad1182918a don't assume bdb is enabled in the ps_1general.test 2006-06-02 20:03:39 +02:00
gkodinov@mysql.com
20c057cef3 Removed duplicate tests from select.test 2006-06-02 18:02:22 +03:00
gkodinov@mysql.com
3dad611cbc bad merge fixed for b4981. 2006-06-02 17:22:21 +03:00
jonas@perch.ndb.mysql.com
22626ad28f ndb - bug#20185 
update test prg + fix typo
 2006-06-02 15:54:09 +02:00
jonas@perch.ndb.mysql.com
97df411f36 ndb - bug#20185 
second try - handle CS_PREPARE_TO_COMMIT explicitly
 2006-06-02 15:22:49 +02:00
ingo@mysql.com
b487d8c252 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-02 14:57:27 +02:00
gkodinov@mysql.com
abd7344676 Merge mysql.com:/home/kgeorge/mysql/4.1/B4981 
into  mysql.com:/home/kgeorge/mysql/5.0/B4981
 2006-06-02 15:35:40 +03:00
holyfoot@mysql.com
3dccb43096 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into mysql.com:/home/hf/work/mysql-5.1-release
 2006-06-02 16:23:49 +05:00
gkodinov@mysql.com
b519877c90 Bug : 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
15e6c492e4 Bug TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table 2006-06-02 09:40:34 +02:00
aelkin@dl145h.mysql.com
45ee32539c Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1
 2006-06-02 09:32:16 +02: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
bell@sanja.is.com.ua
e0bc463419 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
 2006-06-02 09:40:24 +03: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 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
serg@serg.mylan
b7d893c159 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-02 00:04:56 +02:00
serg@serg.mylan
50102fd8d7 second patch for make distcheck 2006-06-01 23:59:34 +02: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
bell@sanja.is.com.ua
364c53101d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
 2006-06-01 23:25:23 +03: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
bell@sanja.is.com.ua
60b738b62b interface for transaction log management added to handlerton 
iterators creation interface added to handlerton
 2006-06-01 21:47:15 +03: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
jani@a193-229-222-105.elisa-laajakaista.fi
d9b68a8310 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.1-new-marvel
 2006-06-01 20:54:00 +03:00
serg@serg.mylan
87e8b5add9 fixing make distcheck again. fix 1. 2006-06-01 19:39:13 +02: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
8f06349fb8 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:13 +03:00
serg@serg.mylan
36e190d2f8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-06-01 19:39:12 +02: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
jani@ua141d10.elisa.omakaista.fi
b5158f252d In prepare_view_securety_context() the sql_command came in wrong. 
If the first part was SHOW and second part SELECT, it would have
thought that the command was SELECT, although the first part of
it was SHOW. It would then fail later.

Thus we need to set thd->lex to old_lex (first part) here before going
in to prepare_security().
 2006-06-01 16:26:16 +03:00
svoj@may.pils.ru
77ab3b28a7 BUG#19192 - CHECK TABLE EXTENDED / REPAIR TABLE show no errors. 
ALTER TABLE crashes
Executing fast alter table (one that doesn't need to copy data)
on tables created by mysql versions prior to 4.0.25 could result
in posterior server crash when accessing these tables.

There was a bug prior to mysql-4.0.25. Number of null fields was
calculated incorrectly. As a result frm and data files gets out of
sync after fast alter table. There is no way to determine by which
mysql version (in 4.0 and 4.1 branches) table was created, thus we
disable fast alter table for all tables created by mysql versions
prior to 5.0 branch.
See BUG#6236.
 2006-06-01 18:08:57 +05:00
tomas@poseidon.ndb.mysql.com
eed7775dff Bug Cannot create table with FK constraint 
- remove error set for auto partitioned tables
 2006-06-01 14:51:58 +02:00
jonas@perch.ndb.mysql.com
ee0b2615f3 ndb - acc - 
add assertion
 2006-06-01 14:36:53 +02:00