mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53739 commits 2780 branches 343 tags 1.6 GiB
Commit graph

16915 commits

Author SHA1 Message Date
evgen@moonbone.local
8fe48b6875 Merge moonbone.local:/work/27219-5.0-opt-mysql 
into  moonbone.local:/work/27219-bug-5.1
 2008-03-28 18:09:14 +03:00
evgen@moonbone.local
0bce8e6f9b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 
into  moonbone.local:/work/27219-5.0-opt-mysql
 2008-03-28 14:31:52 +03:00
gkodinov/kgeorge@magare.gmz
aab53be5c0 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
 2008-03-28 11:27:03 +02:00
gkodinov/kgeorge@magare.gmz
fb931bad54 Merge bk-internal:/home/bk/mysql-5.0 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
 2008-03-28 11:26:40 +02:00
gkodinov/kgeorge@magare.gmz
ec1eb675df Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
 2008-03-28 10:41:52 +02:00
gkodinov/kgeorge@magare.gmz
c95b11713c Merge bk-internal:/home/bk/mysql-5.0 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
 2008-03-28 10:08:24 +02:00
gkodinov/kgeorge@magare.gmz
faaf239f87 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  magare.gmz:/home/kgeorge/mysql/autopush/B35206-5.1-bugteam
 2008-03-28 09:51:06 +02:00
tnurnberg@white.intern.koehntopp.de
a3df2a4cf4 Merge mysql.com:/misc/mysql/mysql-5.1 
into  mysql.com:/misc/mysql/mysql-5.1-opt
 2008-03-27 23:34:12 +01:00
gkodinov/kgeorge@magare.gmz
cde380ea50 Bug #35206: select query result different if the key is indexed or not 
The code for executing indexed ORDER BY was not setting all the 
internal fields correctly when selecting to execute ORDER BY over
and index.
Fixed by change the access method to one that will use the 
quick indexed access if one is selected while selecting indexed
ORDER BY.
 2008-03-27 19:39:21 +02:00
evgen@moonbone.local
21c6145a6e Bug#27219: Aggregate functions in ORDER BY. 
Mixing aggregate functions and non-grouping columns is not allowed in the
ONLY_FULL_GROUP_BY mode. However in some cases the error wasn't thrown because
of insufficient check.

In order to check more thoroughly the new algorithm employs a list of outer
fields used in a sum function and a SELECT_LEX::full_group_by_flag.
Each non-outer field checked to find out whether it's aggregated or not and
the current select is marked accordingly.
All outer fields that are used under an aggregate function are added to the
Item_sum::outer_fields list and later checked by the Item_sum::check_sum_func
function.
 2008-03-27 19:49:32 +03:00
tnurnberg@mysql.com/white.intern.koehntopp.de
7c44702121 Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash 
reverting test that has been obsoleted by changes to the code
 2008-03-27 17:43:17 +01:00
gshchepa/uchum@host.loc
931582bb58 Merge host.loc:/home/uchum/work/mysql-5.0 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 20:05:51 +04:00
davi@mysql.com/endora.local
65c1cf30ff Patch clean up. 
Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.
 2008-03-27 09:37:20 -03:00
davi@endora.local
c0aff004b9 Merge mysql.com:/Users/davi/mysql/mysql-5.1-bug33201 
into  mysql.com:/Users/davi/mysql/mysql-5.0-bugteam
 2008-03-27 09:13:51 -03:00
gshchepa/uchum@host.loc
810059404e Merge host.loc:/home/uchum/work/mysql-5.1 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 15:54:45 +04:00
gshchepa/uchum@host.loc
7edeebc9ab Merge host.loc:/home/uchum/work/mysql-5.0 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 15:52:55 +04:00
joerg@trift2.
e7e5311ce4 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 12:45:16 +01:00
tsmith@rhel5-ia64-a.mysql.com
2ff69e74a4 Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:41:25 +01:00
tsmith@rhel5-ia64-a.mysql.com
3069db1da7 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:20:25 +01:00
tnurnberg@white.intern.koehntopp.de
2a615546ff Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  mysql.com:/misc/mysql/34731/51-34731
 2008-03-27 03:34:49 +01:00
tnurnberg@white.intern.koehntopp.de
88204b5249 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 
into  mysql.com:/misc/mysql/34731/50-34731
 2008-03-27 03:19:21 +01:00
tnurnberg@white.intern.koehntopp.de
bdabc5241d Merge mysql.com:/misc/mysql/34731/50-34731 
into  mysql.com:/misc/mysql/34731/51-34731
 2008-03-27 03:18:46 +01:00
tnurnberg@white.intern.koehntopp.de
e09d983825 Merge mysql.com:/misc/mysql/34731_/50-34731 
into  mysql.com:/misc/mysql/34731/50-34731
 2008-03-27 03:16:35 +01:00
tsmith@rhel5-ia64-a.mysql.com
c82d7ecfee Apply innodb-5.1-ss2360 snapshot 
Fixes:
- Bug #34920: auto_increment resets to 1 on foreign key creation
  We need to use/inherit the passed in autoinc counter for ALTER TABLE
  statements too.
 2008-03-27 02:40:45 +01:00
gshchepa/uchum@host.loc
60f750b9ed view.result: 
Post-merge fix (bug #35193).
 2008-03-27 00:55:13 +04:00
gshchepa/uchum@host.loc
57afe19c8b Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 00:51:29 +04:00
gshchepa/uchum@host.loc
792074bff0 Merge host.loc:/home/uchum/work/5.0-opt-35193 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 00:44:13 +04:00
istruewing@stella.local
ac130084c4 Post-merge fix. 
Query cache does now work with concurrent_insert=0. See
Bug 33756 - query cache with concurrent_insert=0 appears broken
 2008-03-26 20:27:23 +01:00
gshchepa/uchum@host.loc
2dcec449e0 Fixed bug #35193. 
View definition as SELECT ... FROM DUAL WHERE ... has
valid syntax, but use of such view in SELECT or
SHOW CREATE VIEW syntax causes unexpected syntax error.

Server omits FROM DUAL clause when storing view body
string in a .frm file for further evaluation.
However, syntax of SELECT-witout-FROM query is more
restrictive than SELECT FROM DUAL syntax, and doesn't
allow the WHERE clause.

NOTE: this syntax difference is not documented.


View registration procedure has been modified to
preserve original structure of view's body.
 2008-03-26 22:43:12 +04:00
kaa@kaamos.(none)
12dcd0ed80 Merge kaamos.(none):/data/src/bugteam/bug34928/my51 
into  kaamos.(none):/data/src/bugteam/mysql-5.1-bugteam
 2008-03-26 20:36:24 +03:00
kaa@kaamos.(none)
b753e4a02e Fix for bug #34928: Confusion by having Primary Key and Index 
The bug is a regression introduced in 5.1 by the patch for bug28404.

Under some circumstances test_if_skip_sort_order() could leave some
data structures in an inconsistent state so that some parts of code
could assume the selected execution strategy for GROUP BY/DISTINCT as
a loose index scan (e.g. JOIN_TAB::is_using_loose_index_scan()), while
the actual strategy chosen was an ordered index scan, which led to
wrong data being returned.

Fixed test_if_skip_sort_order() so that when changing the type for a
join table, select->quick is reset not only for EXPLAIN, but for the 
actual join execution as well, to not confuse code that depends on its
value to determine the chosen GROUP BY/DISTINCT strategy.
 2008-03-26 19:37:36 +03:00
istruewing@stella.local
1ce57e889d Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 17:36:12 +01:00
istruewing@stella.local
830096fe16 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-26 16:48:46 +01:00
istruewing@stella.local
c882b87110 Merge stella.local:/home2/mydev/mysql-5.1-ateam 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 10:56:03 +01:00
istruewing@stella.local
0eff6e7be5 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 10:51:16 +01:00
istruewing@stella.local
44fbe74e1e Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 10:27:00 +01:00
istruewing@stella.local
c82b842ad8 Merge stella.local:/home2/mydev/mysql-5.0-ateam 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-26 09:34:37 +01:00
istruewing@stella.local
fde9b55d61 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-26 09:33:55 +01:00
malff@lambda.hsd1.co.comcast.net.
2dbcef2538 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-8759
 2008-03-25 17:49:47 -06:00
malff@lambda.hsd1.co.comcast.net.
f8d0d4d97c Manual merge 2008-03-25 17:48:05 -06:00
malff@lambda.hsd1.co.comcast.net.
56f893cc96 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-opt 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-opt-merge
 2008-03-25 17:35:34 -06:00
davi@mysql.com/endora.local
079a174801 Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash 
When trying to get the requested amount of memory for the keybuffer,
the out of memory could be signaled if one of the tentative allocations
fail. Later the server would crash (debug assert) when trying to send
a ok packet with a error set.

The solution is only to signal the error if all tentative allocations
for the keybuffer fail.
 2008-03-25 15:53:57 -03:00
malff@lambda.hsd1.co.comcast.net.
0a2e401c0a Bug#20906 (Multiple assignments in SET in stored routine produce incorrect 
instructions)

This bug can not be reproduced in the current version,
adding the test case to the test suite for coverage, no code change.
 2008-03-25 11:20:11 -06:00
gshchepa/uchum@host.loc
2a3cc7f350 Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-25 19:49:27 +04:00
gshchepa/uchum@host.loc
1eb00401f4 information_schema.test, information_schema.result: 
Minor test case cleanup after bug#34529.
 2008-03-25 19:44:27 +04:00
joerg@trift2.
99ae3b8ad0 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-25 15:24:24 +01:00
svoj@mysql.com/june.mysql.com
88247fd271 BUG#34789 - drop server/create server leaks memory ! 
BUG#34790 - 'create server' doesn't handle out of memory scenario
            well enough

This is an addition to fixes for these bugs, which makes gcov
happy.
 2008-03-25 17:37:53 +04:00
anozdrin/alik@quad.opbmk
1298b1f3c0 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-03-25 14:54:08 +03:00
anozdrin/alik@quad.opbmk
c941b9f349 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
 2008-03-25 14:53:23 +03:00
mhansson/autopush@riffraff.(none)
13d3e8af83 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  riffraff.(none):/data0/autopush/my50-bug34529
 2008-03-24 16:19:50 +01:00