jimw@mysql.com
f21c110d13
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 13:27:38 -07:00
jimw@mysql.com
08eb2588bf
Fix error in having.test to use name instead of number (fixes merge problem)
2006-04-30 13:06:28 -07:00
jimw@mysql.com
3f239914d7
Merge mysql.com:/home/jimw/my/tmp_merge
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 09:43:26 -07:00
gkodinov@lsmy3.wdf.sap.corp
6e5cf86f4d
Merge lsmy3.wdf.sap.corp:/data/users/gkodinov/mysql-4.1-B18492
...
into lsmy3.wdf.sap.corp:/data/users/gkodinov/mysql-5.0-B18492
2006-04-28 12:06:54 +02:00
gkodinov@lsmy3.wdf.sap.corp
ca79343359
BUG#18492: mysqld reports ER_ILLEGAL_REFERENCE in --ps-protocol
...
In the code that converts IN predicates to EXISTS predicates it is changing
the select list elements to constant 1. Example :
SELECT ... FROM ... WHERE a IN (SELECT c FROM ...)
is transformed to :
SELECT ... FROM ... WHERE EXISTS (SELECT 1 FROM ... HAVING a = c)
However there can be no FROM clause in the IN subquery and it may not be
a simple select : SELECT ... FROM ... WHERE a IN (SELECT f(..) AS
c UNION SELECT ...) This query is transformed to : SELECT ... FROM ...
WHERE EXISTS (SELECT 1 FROM (SELECT f(..) AS c UNION SELECT ...)
x HAVING a = c) In the above query c in the HAVING clause is made to be
an Item_null_helper (a subclass of Item_ref) pointing to the real
Item_field (which is not referenced anywhere else in the query anymore).
This is done because Item_ref_null_helper collects information whether
there are NULL values in the result. This is OK for directly executed
statements, because the Item_field pointed by the Item_null_helper is
already fixed when the transformation is done. But when executed as
a prepared statement all the Item instances are "un-fixed" before the
recompilation of the prepared statement. So when the Item_null_helper
gets fixed it discovers that the Item_field it points to is not fixed
and issues an error. The remedy is to keep the original select list
references when there are no tables in the FROM clause. So the above
becomes : SELECT ... FROM ... WHERE EXISTS (SELECT c FROM (SELECT f(..)
AS c UNION SELECT ...) x HAVING a = c) In this way c is referenced
directly in the select list as well as by reference in the HAVING
clause. So it gets correctly fixed even with prepared statements. And
since the Item_null_helper subclass of Item_ref_null_helper is not used
anywhere else it's taken out.
2006-04-28 11:23:31 +02:00
knielsen@mysql.com
6c2f477259
Disable unstable test case.
2006-04-28 09:29:40 +02:00
msvensson@shellback.(none)
480a55287d
Disable udf.test
2006-04-27 22:30:14 +02:00
msvensson@shellback.(none)
e5004d1312
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-27 17:35:29 +02:00
msvensson@shellback.(none)
0e5113aead
Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
...
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library.
2006-04-27 16:32:40 +02:00
jimw@mysql.com
58cb2f317c
Remove obsolete test
2006-04-26 17:09:41 -07:00
jimw@mysql.com
f8bfecdf2f
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 15:29:32 -07:00
tomas@poseidon.ndb.mysql.com
33d169f89b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 23:10:32 +02:00
jimw@mysql.com
ca2b14e7b4
Merge mysql.com:/home/jimw/my/mysql-5.0-12792
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 11:39:48 -07:00
evgen@moonbone.local
611d83b5b0
Merge
2006-04-26 22:35:40 +04:00
jimw@mysql.com
74ca82c857
Merge mysql.com:/home/jimw/my/mysql-5.0-16195
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 11:34:45 -07:00
jimw@mysql.com
960c5621eb
Bug #17849 : sql_big_selects not shown in SHOW VARIABLES output
...
This patch simply adds sql_big_selects to the list of variables
output by SHOW VARIABLES.
2006-04-26 09:21:53 -07:00
mskold@mysql.com
6d01bcdf45
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-26 17:01:01 +02:00
tomas@poseidon.ndb.mysql.com
f12c6e9940
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 17:01:00 +02:00
mskold@mysql.com
63106c0634
Added test for violation of uniqueness constraint at create index
2006-04-26 17:00:59 +02:00
mleich@mysql.com
578406665a
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
2006-04-26 17:00:58 +02:00
aivanov@mysql.com
28e20421b5
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 19:00:57 +04:00
aivanov@mysql.com
1c98f3e262
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 12:48:12 +04:00
aivanov@mysql.com
419d4980e0
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:45:29 +04:00
aivanov@mysql.com
6f8c03ee69
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:43:38 +04:00
aivanov@mysql.com
06c79b143b
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1-innodb
2006-04-26 12:39:47 +04:00
aivanov@mysql.com
88e7e55bb5
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492
...
into mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 11:27:15 +04:00
aivanov@mysql.com
b34ec32b5b
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 11:23:43 +04:00
aivanov@mysql.com
11687d2f84
Make innodb_mysql produce a non-empty output.
2006-04-26 11:15:09 +04:00
tomas@poseidon.ndb.mysql.com
c1d0294983
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 08:38:50 +02:00
aivanov@mysql.com
c66893cd54
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
...
into mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
2006-04-26 09:59:05 +04:00
aivanov@mysql.com
b748835897
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 09:56:06 +04:00
aivanov@mysql.com
7b8c526078
Files innodb.[test|result] are to be used by Innobase only.
...
Use files innodb_mysql.[test|result] instead.
2006-04-26 09:51:57 +04:00
andrey@lmy004.
679f609793
disable before investigation why test case for 19170 is failing on
...
some platforms.
2006-04-26 07:29:26 +03:00
tomas@poseidon.ndb.mysql.com
0e8ccc1bee
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 01:13:16 +02:00
tomas@poseidon.ndb.mysql.com
fc387e73c0
ndb: break out ndb backup compatability test, so that it can be disabled on mac
2006-04-26 01:11:40 +02:00
sergefp@mysql.com
867dffa8a4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
2006-04-26 00:30:54 +04:00
tomas@poseidon.ndb.mysql.com
f2d4d4cfaf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-25 22:21:47 +02:00
andrey@lmy004.
e0c68bffb4
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-new-clean
2006-04-25 23:14:49 +03:00
sergefp@mysql.com
1d4acfb668
BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
...
too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
strictly include the area to scan
(Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big
IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)
2006-04-25 23:33:31 +04:00
aelkin@mysql.com
3363effa52
Merge mysql.com:/home/elkin/MySQL/BARE/5.0
...
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-04-25 20:05:15 +03:00
mleich@mysql.com
ec163e9d1e
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
2006-04-25 19:05:07 +02:00
mleich@mysql.com
3bddd31b92
Post merge correction for the Changeset
...
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
- Reactivation of testcase rpl_deadlock_innodb + updated file with expected results
- Removal of wrong entry within disabled.def
2006-04-25 18:28:29 +02:00
jonas@perch.ndb.mysql.com
49d0bd9beb
reenable ndb_cache2 & ndb_cach_multi2 as I've fixed bug-18597
2006-04-25 17:02:50 +02:00
jonas@perch.ndb.mysql.com
e8797b49d2
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-25 17:02:49 +02:00
pem@mysql.com
0e2d20b1cb
Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-merge
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-04-25 16:20:49 +02:00
evgen@moonbone.local
69b90fb2a8
Merge epotemkin@lsmy3:/data/users/bk/mysql-5.0-opt-bugs
...
into moonbone.local:/work/18739-bug-5.0-mysql
2006-04-25 17:45:31 +04:00
evgen@moonbone.local
6ea27b1013
Manually merged
2006-04-25 13:04:39 +04:00
mskold@mysql.com
4d771e4fca
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
2006-04-25 10:36:39 +02:00
knielsen@mysql.com
854cbe88b6
Merge mysql.com:/usr/local/mysql/mysql-4.1
...
into mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
2006-04-24 23:51:47 +02:00
tomas@poseidon.ndb.mysql.com
243965789e
Bug #14516 Restart of cluster can cause NDB API replication failure
...
- this behavior was already changed, adding testcase
2006-04-24 23:29:33 +02:00