jimw@mysql.com
b4586b2908
Clean up after big merge
2006-05-01 00:14:32 -07:00
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
serg@sergbook.mysql.com
506f9800bd
fixes
2006-04-30 15:52:30 -04: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
brian@zim.(none)
8ab2897e93
Merge zim.(none):/home/brian/mysql/tmp_merge
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-04-29 17:43:26 -07:00
kent@mysql.com
39bd702756
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-29 22:48:22 +02:00
ingo@mysql.com
3c317fef53
Merge mysql.com:/home/mydev/mysql-4.0-bug10405
...
into mysql.com:/home/mydev/mysql-4.1-bug10405
2006-04-29 19:38:41 +02:00
serg@sergbook.mysql.com
281fb1cfc5
make distcheck and cosmetic fixes
2006-04-29 09:33:34 -07:00
kent@mysql.com
5e717959d0
config-win.h:
...
Fix strange "double" define for popen.
Avoid warnings about sprintf() etc. being unsafe.
Corrected typo "#endfif"
2006-04-29 15:58:02 +02:00
kent@mysql.com
a14f1250d6
configure.in:
...
Changed version to 4.1.20
2006-04-29 07:32:12 +02:00
kent@mysql.com
b714a0cec4
mysql.spec.sh:
...
Backport of changes in 5.0 (bug#18294)
2006-04-29 01:28:04 +02:00
kent@mysql.com
cc6ad16b16
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-29 00:52:30 +02:00
elliot@mysql.com
604b5836bb
BUG#19145: mysqld crashes if you set the default value of an enum field to NULL
...
Now test for NULLness the pointers returned from objects created from the
default value. Pushing patch on behalf of cmiller.
2006-04-28 12:15:29 -04:00
msvensson@devsrv-b.mysql.com
bad7e32a94
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
2006-04-28 17:48:50 +02:00
paul@polar.kitebird.com
7c4ddc8bd4
mysqlslap.c:
...
Avoid embedding a bunch of whitespace in --help message.
2006-04-28 10:44:08 -05:00
kent@mysql.com
0222a31358
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-04-28 17:23:14 +02:00
kent@mysql.com
50e8ba04cf
mysql.spec.sh:
...
Include and run mysql_upgrade if needed (bug#19353)
2006-04-28 17:03:11 +02:00
kent@mysql.com
18b3a2c902
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-28 16:27:39 +02:00
msvensson@devsrv-b.mysql.com
580111eab2
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
2006-04-28 16:05:05 +02:00
msvensson@devsrv-b.mysql.com
5297a546ec
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into devsrv-b.mysql.com:/users/msvensson/mysql-4.1
2006-04-28 15:15:13 +02:00
msvensson@neptunus.(none)
50c920ffab
Bug#18818 configure: No longer finds OpenSSL on Mac OS X
...
- Eval shrext_cmds variable before using it
- Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0
2006-04-28 13:55:40 +02:00
msvensson@neptunus.(none)
e44d4e3e2b
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-28 13:53:32 +02:00
msvensson@devsrv-b.mysql.com
84c83c9196
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into devsrv-b.mysql.com:/users/msvensson/mysql-4.1
2006-04-28 13:43:26 +02: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@neptunus.(none)
44322185b5
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-28 08:30:49 +02:00
holyfoot@mysql.com
059e2f7005
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.upgd
2006-04-28 09:19:53 +05:00
holyfoot@deer.(none)
5a75f865c2
bug #18115 (mysql_upgrade on Windows)
...
pushed in 5.0
2006-04-28 09:07:25 +05:00
jimw@mysql.com
b1c3801047
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/nfstmp1/jwinstead/mysql-5.0-clean
2006-04-28 00:33:47 +02:00
elliot@mysql.com
5617f3387a
Fix merge
2006-04-27 17:42:55 -04:00
elliot@mysql.com
bd01c06791
Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2
...
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge-tiny
2006-04-27 17:16:27 -04:00
msvensson@shellback.(none)
480a55287d
Disable udf.test
2006-04-27 22:30:14 +02:00
msvensson@shellback.(none)
f45b26a75e
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-27 22:24:32 +02:00
msvensson@shellback.(none)
f52247a6e8
Fix merge error
2006-04-27 22:21:23 +02:00
msvensson@shellback.(none)
6aa775f348
Return empty string if file does not exist
...
Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example
2006-04-27 21:26:24 +02:00
jimw@mysql.com
0b8d17aae0
Merge mysql.com:/home/jimw/my/mysql-5.0-19393
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-27 10:56:44 -07:00
jimw@mysql.com
36155b63eb
Bug #19393 : Federated tests fail on Windows under pushbuild
...
Supplying --skip-rpl to mysql-test-run.pl would always disable the
slaves, but those slaves may still be needed for the federated tests.
Now we only disable the slaves when they are not used by any of the
tests.
2006-04-27 10:53:19 -07: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@neptunus.(none)
98a7bbe109
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-27 17:30:56 +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
mskold@mysql.com
8af6442ead
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
2006-04-27 15:31:32 +02:00
mskold@mysql.com
f42ceea8e6
Disabled rpl_ndb_dd_partitions, new slogan
2006-04-27 15:29:10 +02:00
mskold@mysql.com
92cac65fc1
Added verification test of on-line (non-copying) alter table
2006-04-27 15:13:21 +02:00
paul@polar.kitebird.com
46ee4ea0df
Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
...
into polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2006-04-27 07:53:15 -05:00
paul@polar.kitebird.com
7162fa4a1a
set_var.cc:
...
System variable was added out of lexical order.
2006-04-27 07:51:56 -05:00
kent@mysql.com
dd2165f6b9
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-04-27 11:38:48 +02:00
kent@mysql.com
7b409a61ba
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-27 11:28:15 +02:00
mskold@mysql.com
b6f64a520b
Enabled rpl_ndb_dd_partitions to see if it still fails
2006-04-27 10:20:33 +02:00