svoj@mysql.com/june.mysql.com
187b01a45f
BUG#30583 - Partition on DOUBLE key + INNODB + count(*) == crash
...
Issuing SELECT COUNT(*) against partitioned InnoDB table may cause
server crash.
Fixed that not all required fields were included into read_set.
2007-09-13 18:33:40 +05:00
svoj@june.mysql.com
ac29e21e0b
Merge mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.1-engines
2007-09-13 17:12:46 +05:00
svoj@june.mysql.com
6a04238e41
Merge mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.0-engines
2007-09-13 16:42:23 +05:00
svoj@mysql.com/june.mysql.com
84a9e656e0
BUG#30590 - delete from memory table with composite btree primary key
...
DELETE query against memory table with btree index may remove
not all matching rows. This happens only when DELETE uses
index read method to find matching rows. E.g. for queries
like DELETE FROM t1 WHERE a=1.
Fixed by reverting fix for BUG9719 and applying proper solution.
2007-09-13 15:39:16 +05:00
gshchepa/uchum@gleb.loc
bd4fd0473c
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-13 00:44:50 +05:00
gshchepa/uchum@gleb.loc
ff042427cf
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-12 23:41:35 +05:00
tomas@whalegate.ndb.mysql.com
df552c310d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-12 14:01:51 +02:00
gshchepa@bk-internal.mysql.com
ae46c7e54a
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-09-12 11:52:42 +02:00
tomas@whalegate.ndb.mysql.com
f1674d1b66
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-09-12 07:34:42 +02:00
tomas@whalegate.ndb.mysql.com
9e37aaf433
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-09-11 16:17:28 +02:00
sergefp@mysql.com
6f702a4b42
Post-merge fixes
2007-09-11 02:41:42 +04:00
sergefp@pylon.mylan
d276ce3402
Merge mysql.com:/home/psergey/mysql-4.1-bug30385
...
into mysql.com:/home/psergey/mysql-5.0-bug30385
2007-09-11 02:24:08 +04:00
malff@lambda.weblab
18300001c1
WL#4030 (Deprecate RENAME DATABASE: replace with ALTER DATABASE <name>
...
UPGRADE)
Bug 17565 (RENAME DATABASE destroys events)
Bug#28360 (RENAME DATABASE destroys routines)
Removed the
RENAME DATABASE db1 TO db2
statement.
Implemented the
ALTER DATABASE db UPGRADE DATA DIRECTORY NAME
statement, which has the same function.
2007-09-10 16:10:37 -06:00
sergefp@mysql.com
da04109de2
BUG#30385: Server crash when deleting with ORDER BY and LIMIT
...
in get_index_for_order(), don't walk over the end of the index key parts
when matching index description and needed ordering.
2007-09-10 16:26:51 +04:00
thek@adventure.(none)
ab60d8ae92
Merge adventure.(none):/home/thek/Development/cpp/bug27358/my51-bug27358
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-09-10 11:42:16 +02:00
thek@adventure.(none)
1f5f2b7649
Merge adventure.(none):/home/thek/Development/cpp/bug27358/my50-bug27358
...
into adventure.(none):/home/thek/Development/cpp/bug27358/my51-bug27358
2007-09-10 11:38:23 +02:00
gshchepa/uchum@gleb.loc
1926819d5b
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-06 22:31:25 +05:00
gshchepa/uchum@gleb.loc
d330a49105
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-06 22:27:13 +05:00
davi@moksha.local
0187e78f40
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
2007-09-06 13:28:00 -03:00
davi@moksha.local
4aaab47ea9
The test case for bug 28587 doesn't work with the embedded version,
...
the first query is not running while we are doing wait queries on
a second connection.
2007-09-06 13:22:34 -03:00
gshchepa/uchum@gleb.loc
4732821e9d
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-06 19:15:31 +05:00
dlenev@mockturtle.local
175c1ab740
Make events.test more robust against timing issues.
2007-09-06 15:57:36 +04:00
dkatz@damien-katzs-computer.local
9fead4bd6a
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_udf_const
2007-09-05 15:15:48 -04:00
dkatz@damien-katzs-computer.local
d8e67d4556
Bug #29804 UDF parameters don't contain correct string length
...
Previously, UDF *_init functions were passed constant strings with erroneous lengths.
The length came from the containing variable's size, not the length of the value itself.
Now the *_init functions get the constant as a null terminated string with the correct
length supplied too.
2007-09-05 15:06:10 -04:00
malff@omega.weblab
0a10782f75
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into omega.weblab:/home/malff/TREE/mysql-5.1-cleanup
2007-09-05 12:15:24 -06:00
malff@omega.weblab
43e5ab75ca
Test events_logs_tests cleanup
...
Fixed test failure under heavy load, in case truncate table is slow.
2007-09-05 12:14:43 -06:00
davi@moksha.local
2e3ded3ec9
The test case for Bug#29936 doesn't work with the embedded version,
...
the first query is not running while we are doing wait queries on
a second connection.
2007-09-05 15:03:02 -03:00
gshchepa/uchum@gleb.loc
582b69686c
Merge gleb.loc:/home/uchum/work/bk/5.1-opt-29938
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-09-05 11:43:40 +05:00
gshchepa/uchum@gleb.loc
adfbea368d
Fixed bug #29938 .
...
mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
and during the restoration from this dump events were created in spite
of the --skip-events option.
The mysqldump client has been modified to ignore mysql.event table data
in case of --skip-events options.
2007-09-05 11:35:29 +05:00
malff/marcsql@weblab.(none)
3a7bcd72f3
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-09-04 14:38:26 -06:00
malff/marcsql@weblab.(none)
0f58ed7e74
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-09-04 12:25:54 -06:00
mhansson@dl145s.mysql.com
313453f192
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into dl145s.mysql.com:/data0/mhansson/my51-bug30234-push
2007-09-03 16:24:33 +02:00
mhansson@dl145s.mysql.com
b1cc84ec1d
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/my50-bug30234-push
2007-09-03 12:44:17 +02:00
mhansson/martin@linux-st28.site
7ed22abe1a
Merge linux-st28.site:/home/martin/mysql/src/bug30234-push/my50-bug30234-push
...
into linux-st28.site:/home/martin/mysql/src/bug30234-push/my51-bug30234-push
2007-09-03 12:02:45 +02:00
mhansson/martin@linux-st28.site
df5c9e69f0
Bug #30234 : Unexpected behavior using DELETE with AS and USING
...
DELETE FROM ... USING ... statements with the following type of
ambiguous aliasing gave unexpected results:
DELETE FROM t1 AS alias USING t1, t2 AS alias WHERE t1.a = alias.a;
This query would leave table t1 intact but delete rows from t2.
Fixed by changing DELETE FROM ... USING syntax so that only alias
references (as opposed to alias declarations) may be used in FROM.
2007-09-03 11:55:35 +02:00
gluh@mysql.com/eagle.(none)
33eaf2cd95
Bug#29408 Cannot find view in columns table if the selection contains a function
...
Use view db name as thread default database, in order to ensure
that the view is parsed and prepared correctly.
2007-09-03 12:22:56 +05:00
malff/marcsql@weblab.(none)
143d8e460e
Fixed timing issues in events.test
2007-08-31 15:51:57 -06:00
malff/marcsql@weblab.(none)
e5ac5a0881
Test cleanup for events.test
2007-08-31 08:49:49 -06:00
gshchepa/uchum@gleb.loc
a6d644e7b5
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30126
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-31 17:50:52 +05:00
gshchepa/uchum@gleb.loc
df7771de65
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30126
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-31 17:05:37 +05:00
gshchepa/uchum@gleb.loc
3e49bbd8e7
Fixed bug #30126 .
...
When dumping database from a 4.x server, the mysqldump client
inserted a delimiter sign inside special commentaries of the form:
/*!... CREATE DATABASE IF NOT EXISTS ... ;*/
During restoration that dump file was splitten by delimiter signs on
the client side, and the rest of some commentary strings was prepended
to following statements.
The 4x_server_emul test case option has been added for use with the
DBUG_EXECUTE_IF debugging macro. This option affects debug server
builds only to emulate particular behavior of a 4.x server for
the mysqldump client testing. Non-debugging builds are not affected.
2007-08-31 16:59:07 +05:00
malff/marcsql@weblab.(none)
ca2b2585a5
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
2007-08-30 17:23:40 -06:00
malff/marcsql@weblab.(none)
4cab11097e
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-08-30 17:05:49 -06:00
malff/marcsql@weblab.(none)
2482c59740
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-08-30 13:23:59 -06:00
davi@moksha.local
37d48bfe30
Post-merge test case with wait_condition for Bug#28587
2007-08-30 16:19:23 -03:00
malff/marcsql@weblab.(none)
4792ed4220
Bug#28779 (mysql_query() allows execution of statements with unbalanced
...
comments)
This change set is for 5.1 (manually merged)
Before this fix, the server would accept queries that contained comments,
even when the comments were not properly closed with a '*' '/' marker.
For example,
select 1 /* + 2 <EOF>
would be accepted as
select 1 /* + 2 */ <EOF>
and executed as
select 1
With this fix, the server now rejects queries with unclosed comments
as syntax errors.
Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
closed with '*' '/' to be parsed correctly.
2007-08-30 12:57:05 -06:00
malff/marcsql@weblab.(none)
f51c6acc37
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-28779-b
2007-08-30 10:38:20 -06:00
kaa@polly.(none)
4c2a63ea54
Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164
...
into polly.(none):/home/kaa/src/bug30164/my51-bug30164
2007-08-30 17:23:39 +04:00
kaa@polly.(none)
33d10a0667
Use double quotes instead of single ones which make the test fail on Windows. This is for bug #30164 .
2007-08-30 17:21:43 +04:00
kaa@polly.(none)
e79902aa5c
Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164
...
into polly.(none):/home/kaa/src/bug30164/my51-bug30164
2007-08-30 12:55:29 +04:00