ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f538288bca
Fix for bug #35392 : Delete all statement does not execute properly
...
after few delete statements
Problem: changing a file size might require that it must be
unmapped beforehand.
Fix: unmap the file before changing its size.
2008-03-28 19:16:52 +04:00
gkodinov/kgeorge@magare.gmz
ab82eca67c
Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
...
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
2008-03-28 11:28:50 +02: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
57e7c282d4
Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
...
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
2008-03-28 11:01:01 +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
d746c664cc
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
...
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
2008-03-28 10:38:55 +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
51e915c365
Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
...
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
2008-03-28 09:55:51 +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
963f86f879
Merge mysql.com:/misc/mysql/mysql-5.0-opt
...
into mysql.com:/misc/mysql/mysql-5.1-opt
2008-03-28 00:46:43 +01:00
tnurnberg@white.intern.koehntopp.de
282825af33
Merge mysql.com:/misc/mysql/mysql-5.0
...
into mysql.com:/misc/mysql/mysql-5.0-opt
2008-03-27 23:35:56 +01: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
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
02235ace7b
Merge host.loc:/home/uchum/work/5.0-opt
...
into host.loc:/home/uchum/work/5.1-opt
2008-03-27 20:07:05 +04: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
joerg@trift2.
fe0bff70e0
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-03-27 13:32:55 +01:00
joerg@trift2.
6d8e1832e0
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into trift2.:/MySQL/M51/push-5.1
2008-03-27 13:28:00 +01:00
joerg@trift2.
dc00a52464
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into trift2.:/MySQL/M50/push-5.0
2008-03-27 13:21:34 +01:00
joerg@trift2.
2db55bf938
Merge trift2.:/MySQL/M51/ndb-decl-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-03-27 13:20:24 +01: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
5713f9d150
Merge host.loc:/home/uchum/work/5.0-opt
...
into host.loc:/home/uchum/work/5.1-opt
2008-03-27 16:07:01 +04:00
df@pippilotta.erinye.com
334e647e3a
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2008-03-27 13:04:16 +01:00
df@pippilotta.erinye.com
7297fe1950
BUG#25340
2008-03-27 13:02:59 +01:00
gshchepa/uchum@host.loc
faf4737bce
Merge host.loc:/home/uchum/work/4.1-opt
...
into host.loc:/home/uchum/work/5.0-opt
2008-03-27 16:00:26 +04: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
joerg@trift2.
e2b2520450
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2008-03-27 12:53:58 +01: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
c7cd786ef8
Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
...
into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
2008-03-27 08:59:47 +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
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
cmiller@zippy.cornsilk.net
75da480f85
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-03-26 14:30:26 -04:00
cmiller@zippy.cornsilk.net
3af3e6963b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-03-26 14:24:10 -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
cmiller@zippy.cornsilk.net
cfb9c8458e
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
2008-03-26 12:39:22 -04:00