iggy@amd64.(none)
9346e9246a
Merge amd64.(none):/src/bug24400/my41-bug24400
...
into amd64.(none):/src/bug24400/my50-bug24400
2007-06-04 12:47:48 -04:00
gkodinov/kgeorge@macbook.gmz
f081188fcb
Bug #28488 : Incorrect information in file: './test/t1_test#.frm'
...
While executing ALTER TABLE ... PARTITION the server uses
a temporary "shadow" table to create the updated table.
This shadow table then gets renamed as the original table.
The shadow table was not prefixed with the special prefix that
marks temporary tables so it was picked up by SHOW TABLE STATUS.
Fixed by isolating the code to create the shadow table name in a
separate function and prefixing the shadow table name with the
special prefix to exclude it from the list of user tables.
See bug 18775 and WL1324 for details.
2007-06-04 18:56:29 +03:00
igor@olga.mysql.com
76b580b84e
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-06-04 05:57:57 -07:00
igor@olga.mysql.com
d0cb11e6ba
Post-merge fix.
2007-06-04 05:55:27 -07:00
igor@olga.mysql.com
a5011de0a8
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge
2007-06-04 03:16:17 -07:00
igor@olga.mysql.com
31c57a1efc
Post-merge fix.
2007-06-04 03:03:15 -07:00
joerg@trift2.
724307b7ab
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-06-04 12:00:57 +02:00
jonas@perch.ndb.mysql.com
50d2a6de0c
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-06-04 11:59:14 +02:00
jonas@perch.ndb.mysql.com
130667233a
ndb - bug#28726
...
make sure to remove LCP files aswell if specifying --initial
2007-06-04 11:58:25 +02:00
joerg@trift2.
d822cf03e5
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-06-04 11:24:49 +02:00
jonas@perch.ndb.mysql.com
79da61069b
ndb -
...
update dl145a config for autotest
2007-06-04 10:32:32 +02:00
jonas@perch.ndb.mysql.com
eab3e836e8
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-06-04 10:29:57 +02:00
jonas@perch.ndb.mysql.com
b8e43a1d9d
ndb - make size of redo log files (fragment log files) configurable
...
using new config variable FragmentLogFileSize (4M - 1G)
2007-06-04 10:27:10 +02:00
mhansson@dl145s.mysql.com
d9fcc304d9
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
2007-06-04 09:26:54 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9c67f70f13
after-merge fix.
2007-06-04 11:52:14 +05:00
igor@olga.mysql.com
ca49b83d5a
Merge olga.mysql.com:/home/igor/mysql-5.1
...
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge
2007-06-03 22:52:02 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
9be267cbf2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b28652/b28652.5.0
2007-06-04 10:37:43 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a4e6061a4c
Merge mysql.com:/home/ram/work/b28652/b28652.5.0
...
into mysql.com:/home/ram/work/b28652/b28652.5.1
2007-06-04 10:14:28 +05:00
mhansson@dl145s.mysql.com
358567dfab
Merge bk-internal:/home/bk/mysql-5.1-opt
...
into dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush
2007-06-03 23:31:57 +02:00
evgen@moonbone.local
b642eb121f
item_func.h, item_func.cc:
...
Post merge fix for the bug#28494.
2007-06-03 21:52:00 +04:00
tomas@whalegate.ndb.mysql.com
4ef92c285b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-03 19:41:14 +02:00
tomas@whalegate.ndb.mysql.com
7523452de1
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-06-03 19:31:53 +02:00
tomas@whalegate.ndb.mysql.com
8a9bf13922
Bug#20612.
2007-06-03 19:30:37 +02:00
igor@olga.mysql.com
44b46b73f2
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
2007-06-03 07:58:07 -07:00
evgen@moonbone.local
6acad85a95
Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
...
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-06-03 16:06:55 +04:00
evgen@moonbone.local
27d956b5e9
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
2007-06-03 16:00:04 +04:00
evgen@moonbone.local
88147d5cfe
user_var.result:
...
Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
Corrected function names after fix for the bug#28494.
2007-06-03 15:56:48 +04:00
evgen@moonbone.local
5d695b777a
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
2007-06-03 14:46:37 +04:00
evgen@moonbone.local
7dbe9d3318
user_var.result, user_var.test:
...
Extended test case for the bug#28494.
2007-06-03 14:46:09 +04:00
igor@olga.mysql.com
cc0eff3e63
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
2007-06-03 00:21:42 -07:00
gkodinov/kgeorge@macbook.gmz
8fd809bfd8
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt
2007-06-03 10:03:37 +03:00
gkodinov/kgeorge@macbook.gmz
9a1d8adc9d
Bug #26162 : Trigger DML ignores low_priority_updates setting
...
The value of "low-priority-updates" option and the LOW PRIORITY
prefix was taken into account at parse time.
This caused triggers (among others) to ignore this flag (if
supplied for the DML statement).
Moved reading of the LOW_PRIORITY flag at run time.
Fixed an incosistency when handling
SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
delayed INSERTs.
Tested by checking the effect of LOW_PRIORITY flag via a
trigger.
2007-06-03 09:40:00 +03:00
evgen@moonbone.local
9967e513a5
Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
...
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-06-03 09:17:31 +04:00
iggy@amd64.(none)
bc651da095
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into amd64.(none):/src/bug24732/my50-bug24732
2007-06-02 21:26:49 -04:00
iggy@amd64.(none)
e411ccf88c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into amd64.(none):/src/bug24732/my51-bug24732
2007-06-02 21:24:59 -04:00
igor@olga.mysql.com
91da3132b5
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
2007-06-02 14:37:42 -07:00
evgen@moonbone.local
f4e20490a4
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
2007-06-03 01:25:24 +04:00
evgen@moonbone.local
162a6b42ec
item_func.cc:
...
Post fix for bug#28494.
The Item_func_set_user_var::check method now silently doesn't use result_field
if it isn't defined.
2007-06-03 01:24:56 +04:00
evgen@moonbone.local
400bfb92b8
Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
...
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
2007-06-02 23:49:52 +04:00
igor@olga.mysql.com
55fea25de4
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
2007-06-02 12:46:48 -07:00
evgen@moonbone.local
294ead9ac9
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
2007-06-02 23:20:54 +04:00
evgen@moonbone.local
4934646764
Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
...
This is an additional fix.
Item::val_xxx methods are supposed to use original data source and
Item::val_xxx_result methods to use the item's result field. But for the
Item_func_set_user_var class val_xxx_result methods were mapped to val_xxx
methods. This leads, in particular, to producing bad sort keys and thus
wrong order of the result set of queries with group by/order by clauses.
The set of val_xxx_result methods is added to the Item_func_set_user_var
class. It's the same as the val_xxx set of method but uses the result_field
to return a value.
2007-06-02 23:17:46 +04:00
igor@olga.mysql.com
5cbebf0a18
Fixed bug #28728 : a crash when executing EXPLAIN EXTENDED for a query
...
using a derived table over a grouping subselect.
This crash happens only when materialization of the derived tables
requires creation of auxiliary temporary table, for example when
a grouping operation is carried out with usage of a temporary table.
The crash happened because EXPLAIN EXTENDED when printing the query
expression made an attempt to use the objects created in the mem_root
of the temporary table which has been already freed by the moment
when printing is called.
This bug appeared after the method Item_field::print() had been
introduced.
2007-06-02 11:44:16 -07:00
sergefp@mysql.com
ad18c4b95c
BUG#28427: fix typo, s/bool/uint/
2007-06-02 21:43:04 +04:00
msvensson@pilot.(none)
64761758a3
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-02 09:06:21 +02:00
msvensson@pilot.(none)
be55062f64
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-02 09:05:37 +02:00
tomas@whalegate.ndb.mysql.com
96ac5527af
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build
2007-06-02 06:34:48 +02:00
tomas@whalegate.ndb.mysql.com
eb5fd16e59
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-02 06:33:18 +02:00
igor@olga.mysql.com
5a5410e40e
Post-merge fix.
2007-06-01 17:58:46 -07:00
iggy@amd64.(none)
586c5b430e
Post Merge fixup.
2007-06-01 20:37:45 -04:00