summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.(none)2006-05-019-23/+220
|\ | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
| * SECURITY FIXcmiller@zippy.(none)2006-05-019-23/+220
| | | | | | | | | | | | | | | | | | | | | | Bug#17667: An attacker has the opportunity to bypass query logging. This adds a new, local-only printf format specifier to our *printf functions that allows us to print known-size buffers that must not be interpreted as NUL-terminated "strings." It uses this format-specifier to print to the log, thus fixing this problem.
* | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2006-05-011-24/+20
|\ \ | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
| * \ Mergekent@mysql.com2006-05-011-24/+20
| |\ \
| | * | mysql.spec.sh:kent@mysql.com2006-05-011-15/+11
| | | | | | | | | | | | | | | | Use "./libtool --mode=execute" to find real path to executables
| | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2006-04-291-2/+7
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
| | | * | config-win.h:kent@mysql.com2006-04-291-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix strange "double" define for popen. Avoid warnings about sprintf() etc. being unsafe. Corrected typo "#endfif"
| | * | | configure.in:kent@mysql.com2006-04-291-2/+2
| | |/ / | | | | | | | | | | | | Changed version to 4.1.20
| | * | mysql.spec.sh:kent@mysql.com2006-04-291-15/+57
| | | | | | | | | | | | | | | | Backport of changes in 5.0 (bug#18294)
| | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2006-04-294-13/+127
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
| | * \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2006-04-287-30/+39
| | |\ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
* | | \ \ \ Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2006-05-013-2/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot@mysql.com2006-05-013-2/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.clean
| | * | | | | Fix for Win buildholyfoot@deer.(none)2006-05-013-2/+6
| | | | | | |
* | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-18607jimw@mysql.com2006-05-011-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | | | | Bug #18607: LOAD DATA FROM MASTER fails because of INFORMATION_SCHEMA databasejimw@mysql.com2006-04-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply exclude INFORMATION_SCHEMA from LOAD DATA FROM MASTER just like we exclude the `mysql` database. There's no test for this, because it requires an unfiltered 'LOAD DATA FROM MASTER' which is too likely to cause chaos (such as when running the test suite against an external server).
* | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-18312jimw@mysql.com2006-05-011-4/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | | | | | Bug #18312: mysqltest: --sleep=0 doesn't disable sleepjimw@mysql.com2006-04-211-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow --sleep=0 to be specified to mysqltest, so that sleep calls can be disabled. Original patch from Paul DuBois.
* | | | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.(none)2006-05-013-10/+122
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
| * | | | | | BUG#19145: mysqld crashes if you set the default value of an enum field to NULLelliot@mysql.com2006-04-283-10/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now test for NULLness the pointers returned from objects created from the default value. Pushing patch on behalf of cmiller.
| * | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@devsrv-b.mysql.com2006-04-286-29/+38
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | into devsrv-b.mysql.com:/users/msvensson/mysql-4.1
| * | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@devsrv-b.mysql.com2006-04-281-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into devsrv-b.mysql.com:/users/msvensson/mysql-4.1
* | \ \ \ \ \ \ Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2006-04-281-1/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
| * \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com2006-04-281-1/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
| | * | | | | | | | mysql.spec.sh:kent@mysql.com2006-04-281-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include and run mysql_upgrade if needed (bug#19353)
* | | | | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2006-04-286-39/+42
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
| * | | | | | | | | Merge lsmy3.wdf.sap.corp:/data/users/gkodinov/mysql-4.1-B18492gkodinov@lsmy3.wdf.sap.corp2006-04-286-39/+42
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | into lsmy3.wdf.sap.corp:/data/users/gkodinov/mysql-5.0-B18492
| | * | | | | | | | BUG#18492: mysqld reports ER_ILLEGAL_REFERENCE in --ps-protocolgkodinov@lsmy3.wdf.sap.corp2006-04-286-29/+38
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Bug#18818 configure: No longer finds OpenSSL on Mac OS Xmsvensson@neptunus.(none)2006-04-282-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Eval shrext_cmds variable before using it - Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0
* | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-04-280-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2006-04-271-3/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2006-04-261-3/+5
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2006-04-241-3/+5
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| | | | * | | | | | | | Bug#18818 configure: No longer finds OpenSSL on Mac OS Xmsvensson@neptunus.(none)2006-04-191-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Eval shrext_cmds variable before using it
* | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-04-28139-1463/+11839
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot@mysql.com2006-04-288-1/+932
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.upgd
| | * | | | | | | | | | | bug #18115 (mysql_upgrade on Windows)holyfoot@deer.(none)2006-04-288-1/+932
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pushed in 5.0
| * | | | | | | | | | | | Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0jimw@mysql.com2006-04-281-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/nfstmp1/jwinstead/mysql-5.0-clean
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-19393jimw@mysql.com2006-04-271-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| | | * | | | | | | | | | | Bug #19393: Federated tests fail on Windows under pushbuildjimw@mysql.com2006-04-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | Disable udf.testmsvensson@shellback.(none)2006-04-271-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@shellback.(none)2006-04-272-9/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0
| | * | | | | | | | | | | | | Fix merge errormsvensson@shellback.(none)2006-04-272-9/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Return empty string if file does not existmsvensson@shellback.(none)2006-04-272-10/+4
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example
| * | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-04-27146-1467/+10982
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * | | | | | | | | | | | Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set ↵msvensson@shellback.(none)2006-04-277-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | | | | | Change sleep_until_file_created to sleep 100 millisecond instead of sleeping ↵msvensson@neptunus.(none)2006-04-261-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 seconds between each iteration.
| | * | | | | | | | | | | | Bug#19362 im_daemon_lifecycle fails when built from source distributionmsvensson@neptunus.(none)2006-04-262-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add function "mysqld_real_path" which is needed if the mysqld_path is a symlink or a script(like libtool) that executes the real mysqld. - Add new variable mysqld_real_path - Use mysqld_real_path from fill_instance_version
| | * | | | | | | | | | | | Remove hacks for building shared libs on aix and qnxmsvensson@neptunus.(none)2006-04-261-39/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Revert use of octal numbers for chmodmsvensson@neptunus.(none)2006-04-241-2/+2
| | | | | | | | | | | | | |
View Lorry Controller Status