database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity
38,069 Commits 3,276 Branches 1,097 Tags
fe0cfacf35514b6a271d5be99e16ca18bea08715
Commit Graph

13917 Commits

Author SHA1 Message Date
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
evgen@moonbone.local
a2261d57be Many files: 
After merge fix
 2006-06-15 01:48:41 +04:00
msvensson@neptunus.(none)
d0f27fd057 Update function 'mtr_options_from_file' after review (and some help) 2006-06-14 22:15:21 +02: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
evgen@moonbone.local
e35a0ca4b7 Manually merged 2006-06-14 23:54:08 +04:00
msvensson@neptunus.(none)
ec07987651 Remove opt_old_master, using a 4.0 mysqld with mysql-test-run.pl from 5.1 is not supported 2006-06-14 21:46:41 +02:00
msvensson@neptunus.(none)
c7b9472a6d Cleanup ndb options 2006-06-14 21:45:15 +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
msvensson@neptunus.(none)
79bdcc49c9 Remove opt_local, noone knows what it should do 2006-06-14 20:36:23 +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
220345d3c8 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-06-14 20:18:01 +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
gkodinov@mysql.com
36fae7be63 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18895
 2006-06-14 17:37:26 +03:00
gkodinov@mysql.com
7385e7c72a Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18895
 2006-06-14 17:35:14 +03:00
msvensson@neptunus.(none)
47142b6730 Update explanation why test was skipped 2006-06-14 16:03:27 +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
evgen@moonbone.local
043da83a09 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
 2006-06-14 17:18:42 +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
gkodinov@mysql.com
476d728a8d Bug #18895: BIT values cause joins to fail 
The Field::eq() considered instances of Field_bit that differ only in 
bit_ptr/bit_ofs equal. This caused equality conditions optimization 
(build_equal_items_for_cond()) to make bad field substitutions that result
in wrong predicates. 
Field_bit requires an overloaded eq() function that checks the bit_ptr/bit_ofs
in addition to Field::eq().
 2006-06-14 15:57:23 +03: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
evgen@moonbone.local
4c3108fc10 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/15962-bug-5.0-opt-mysql
 2006-06-14 15:27:27 +04: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
svoj@may.pils.ru
fe1f04c7c9 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG19580/mysql-5.1-new
 2006-06-14 15:17:47 +05:00
msvensson@neptunus.(none)
dd1ef2d138 Print error if using --debug and binaries does not support it 2006-06-14 11:59:04 +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
serg@serg.mylan
ebd20550f6 move --disable_warnings where it belongs 2006-06-14 10:04:30 +02:00
gkodinov@mysql.com
5bd4966345 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean 
into  mysql.com:/home/kgeorge/mysql/5.0/B20195
 2006-06-14 10:41:35 +03: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
igor@rurik.mysql.com
5cdd1eb62d Post-review corrections of the fix for bug #18206. 2006-06-13 22:38:00 -07:00
igor@rurik.mysql.com
fc46017c2d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
 2006-06-13 22:33:38 -07: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
igor@rurik.mysql.com
3f5f33d8f8 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-06-13 20:04:48 -07:00
igor@rurik.mysql.com
355753baa4 Fixed bug #14896. 
This bug in Field_string::cmp resulted in a wrong comparison 
with keys in partial indexes over multi-byte character fields.
Given field a is declared as 
  a varchar(16) collate utf8_unicode_ci
INDEX(a(4)) gives us an example of such an index.

Wrong key comparisons could lead to wrong result sets if 
the selected query execution plan used a range scan by 
a partial index over a utf8 character field.
This also caused wrong results in many other cases.
 2006-06-13 19:57:50 -07: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