database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity
54,122 Commits 3,153 Branches 363 Tags
cbd31fd1256ed32a43c416d93e9fb88fb90257c8
Commit Graph

21965 Commits

Author SHA1 Message Date
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
joerg@trift2.
270aaa17b2 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2008-03-27 12:38:21 +01:00
tsmith@rhel5-ia64-a.mysql.com
95c8fb8db2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
 2008-03-27 08:50:54 +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
hezx@mail.hezx.com
35c158ec85 post fix after push of bug#33029 2008-03-27 13:48:04 +08:00
hezx@mail.hezx.com
68fc98bdb3 post fix after push of BUG#33029 2008-03-27 13:42:34 +08: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
cmiller@zippy.cornsilk.net
07a3ae238a Fix minor complaints of Marc Alff, for patch against B-g#15776. 2008-03-26 14:52:10 -04: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
hezx@mail.hezx.com
905659a2a0 Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.1-new-rpl 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/b33029_5.0_to_5.1_fails_on_dup_key/5.1
 2008-03-26 21:40:44 +08:00
hezx@mail.hezx.com
d0ebb657ee Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rpl 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/b33029_5.0_to_5.1_fails_on_dup_key/5.0
 2008-03-26 21:37:34 +08:00
jani@a88-113-38-195.elisa-laajakaista.fi
0c59da1ca2 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2008-03-26 12:32:27 +02: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
istruewing@stella.local
97531cadc9 Bug#35559 - plugin_load.test creates warnings 
plugin_load.test created lines in the warnings files and made
pushbuild cells yellow. Some pushbuild systems are configured
so that they don't build the ha_example plugin. Trying to load
them creates error messages in the error log. These were copied
to the warnings file.

Fixed by ignoring expected error messages for non-existent
ha_example.
 2008-03-25 21:30:45 +01:00
anozdrin/alik@quad.opbmk
a1eab6ee8b 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 23:09:05 +03: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
svoj@june.mysql.com
2d44db25e7 Merge mysql.com:/home/svoj/devel/mysql/BUG35509/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG34768/mysql-5.1-engines
 2008-03-25 20:28:43 +04: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
msvensson@pilot.mysql.com
69a755d6a0 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
 2008-03-25 16:28:02 +01:00
msvensson@pilot.mysql.com
06c73d7d1c Bug#34761 Mysql-test-run.pl script hangs on Windows 2008-03-25 16:27:23 +01:00
msvensson@pilot.mysql.com
3748684396 Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
 2008-03-25 16:02:06 +01:00
joerg@trift2.
e58f029f9e Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-25 15:34:23 +01: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
mkindahl@dl145h.mysql.com
bc683c6450 Eliminating compiler warnings. 2008-03-25 15:20:42 +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