mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 01:34:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35462 commits 2785 branches 343 tags 1.7 GiB
Commit graph

16662 commits

Author SHA1 Message Date
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
b631659c6c BUG#20397: Crash when alter table t1 engine = x; 
Review fixes
 2006-06-15 15:56:47 -04:00
evgen@moonbone.local
4dfd3af232 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/18175-bug-5.0-opt
 2006-06-15 22:10:47 +04:00
evgen@moonbone.local
0fb6b044e0 Fixed bug#18175: The nest_level counter wasn't decremented for union parts which 
resulted in a wrong error message.

The nest_level counter indicates the depth of nesting for a subselect. It is
needed to properly resolve aggregate functions in nested subselects. Obviously 
it shouldn't be incremented for UNION parts because they have the same level of
nesting. This counter was incremented by 1 in the mysql_new_select() function
for any new select and wasn't decremented for UNION parts. This resulted in
wrongly reported error messages.

Now the nest_level counter is decremented by 1 for any union part.
 2006-06-15 22:09:58 +04:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
9a34f6199b BUG#19309: Crash if double procedural alter 2006-06-15 14:03:17 -04:00
rburnett@bk-internal.mysql.com
384fa9b67e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-15 14:56:00 +02:00
evgen@moonbone.local
d22c082b87 Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt 
into moonbone.local:/work/16377-4.1-after
 2006-06-15 16:41:26 +04:00
evgen@moonbone.local
2877b5ef64 item_cmpfunc.h, cast.result: 
Post fix for bug#16377
 2006-06-15 16:39:18 +04:00
petr@outpost.site
86420b38aa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-15 15:38:14 +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
evgen@moonbone.local
d3502181c0 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/19789-bug-5.0-opt-mysql
 2006-06-15 15:01:37 +04:00
evgen@moonbone.local
b669852866 Merge moonbone.local:/work/15351-bug-4.1-mysql 
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
 2006-06-15 14:57:53 +04:00
ingo@chilla.local
33e38a675b Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-15 12:22:40 +02:00
serg@serg.mylan
a06dda12fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 12:21:34 +02: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
mskold@mysql.com
32c45f9209 Fixed typo in variable name 2006-06-15 11:59:21 +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
mats@mysql.com
cf46736746 Fixing code to avoid compile problem on Solaris (aCC). 2006-06-15 10:11:50 +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
ramil@mysql.com
26fa98a2cb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b15558
 2006-06-15 11:15:56 +05: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
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
serg@serg.mylan
99fd8f728b cleanup String::set(integer) 2006-06-14 23:09:03 +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
evgen@moonbone.local
c9077f07e7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
 2006-06-14 22:57:00 +04: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
ea6ed5ffa7 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:22:43 +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
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
sergefp@mysql.com
6e5f578a46 Better comments in KEY_PART_INFO struct 2006-06-14 21:06:02 +04: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
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
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