summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge from mysql-5.0.67-releaseJonathan Perkin2008-08-1512-34/+108
|\
| * Revert previous unintentional license change.Jonathan Perkin2008-08-041-2/+1
| |
| * Change preprocessor tests to match what we will be using.Jonathan Perkin2008-08-041-1/+1
| |
| * Use autoconf glue around new my_is_symlink to avoid stat(2) and friendsJonathan Perkin2008-08-041-0/+4
| | | | | | | | | | being used on systems which don't support that interface.
| * mergingAlexey Botchkov2008-07-311-0/+1
| |\
| | * Bug#34159: mysql_install_db fails with sql_mode=TRADITIONALGeorgi Kodinov2008-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reset session sql_mode before creating system tables as it is done in the mysql_fix_privilege_tables.sql script. scripts/mysql_system_tables.sql: reset sql_mode
| * | Buq#32167 another privilege bypass with DATA/INDEX DIRECTORY.Alexey Botchkov2008-07-313-24/+33
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_if_data_home_dir fixed to look into real path. Checks added to mi_open for symlinks into data home directory. per-file messages: include/my_sys.h Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY. my_is_symlink interface added mysql-test/r/udf.result test result fixed (not related to #32167) mysys/my_symlink.c my_is_symlink() implementsd my_realpath() now returns the 'realpath' even if a file isn't a symlink
| * Bug#37428 Potential security issue with UDFs - linux shellcode execution.Alexey Botchkov2008-07-285-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugin_dir option backported from 5.1 per-file messages: sql/mysql_priv.h Bug#37428 Potential security issue with UDFs - linux shellcode execution. opt_plugin_dir and opt_plugin_dir_ptr declared. sql/mysqld.cc Bug#37428 Potential security issue with UDFs - linux shellcode execution. 'plugin_dir' option added sql/set_var.cc Bug#37428 Potential security issue with UDFs - linux shellcode execution. 'plugin_dir' option added. sql/sql_udf.cc Bug#37428 Potential security issue with UDFs - linux shellcode execution. opt_plugin_dir added to the udf->dl path. Warn if it's not specified. sql/unireg.h Bug#37428 Potential security issue with UDFs - linux shellcode execution. PLUGINDIR defined.
| * Merge fix for bug#38180 from mysql-5.0.66a-releaseJonathan Perkin2008-07-183-26/+57
| |\
| * | Bug#33812: mysql client incorrectly parsing DELIMITERDavi Arnaut2008-07-173-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert fix for this bug as it introduced a regression reported in Bug#38158. client/mysql.cc: Revert fix for Bug#33812 mysql-test/r/mysql.result: Revert fix for Bug#33812 mysql-test/t/mysql_delimiter.sql: Revert fix for Bug#33812
| * | Merge from mysql-5.0.66-releaseJonathan Perkin2008-07-1744-268/+432
| |\ \
* | \ \ Merge fix for bug#38180 from mysql-5.0.66a-releaseJonathan Perkin2008-07-183-26/+57
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnfTimothy Smith2008-07-163-26/+57
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Pull out some of unpack_dirname() into normalize_dirname(); this new function does not expand "~" to the home directory. Use this function in unpack_dirname(), and use it during init_default_directories() to remove duplicate entries without losing track of which directory is a user's home dir.
* | | Merge from mysql-5.0.66-releaseJonathan Perkin2008-07-1744-268/+432
|\ \ \ | |/ /
| * | fixed a compilation warning on windows 64.Georgi Kodinov2008-07-091-1/+1
| | |
| * | automatic merge of 5.0-bugteam into the 5.0.66 release clone.Georgi Kodinov2008-07-0944-268/+432
| |\ \
| | * \ Manual merge with mysql-5.0-bugteamMats Kindahl2008-07-0840-102/+220
| | |\ \
| | | * \ MergeMarc Alff2008-07-0730-31/+31
| | | |\ \
| | | | * \ Merge bug.Chad MILLER2008-07-0430-31/+31
| | | | |\ \
| | | | | * | Bug#30563: Is not possible to create rpl_ or innodb test if needed \Chad MILLER2008-07-0430-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use ANSI_QUOTES Make all have_* tests universally safe by using ANSI quotes.
| | | * | | | Bug#26030 (Parsing fails for stored routine w/multi-statement executionMarc Alff2008-07-078-65/+186
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled) Before this fix, the lexer and parser would treat the ';' character as a different token (either ';' or END_OF_INPUT), based on convoluted logic, which failed in simple cases where a stored procedure is implemented as a single statement, and used in a multi query. With this fix: - the character ';' is always parsed as a ';' token in the lexer, - parsing multi queries is implemented in the parser, in the 'query:' rules, - the value of thd->client_capabilities, which is the capabilities negotiated between the client and the server during bootstrap, is immutable and not arbitrarily modified during parsing (which was the root cause of the bug)
| | | * | | Fix "C++ code in C file" syntax error in mysys/default.cTimothy Smith2008-07-021-1/+3
| | | | | |
| | | * | | Bug#37380 - Test funcs_1.is_columns_myisam_embedded fails on OS XPatrick Crews2008-07-011-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test was failing due to the addition of a '\x05' character in result sets Latest builds of the server have shown this problem to have disappeared. Removing code within the test that disables the test on Mac OS X. Recommit due to tree error on earlier, approved patch.
| | * | | | Bug #37150 Risk for crash in User_var_log_event::exec_event()Mats Kindahl2008-07-071-1/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On certain kinds of errors (e.g., out of stack), a call to Item_func_ set_user_var::fix_fields() might fail. Since the return value of this call was not checked inside User_var_log_event::exec_event(), continuing execution after this will cause a crash inside Item_func_set_user_var:: update_hash(). The bug is fixed by aborting execution of the event with an error if fix_fields() fails, since it is not possible to continue execution anyway. sql/log_event.cc: Aborting execution of event if fix_fields() fails since execution of update_hash() might cause a crash.
| | * | | Merge from upstream (my:5.0-bugteam)Timothy Smith2008-06-27112-5745/+8914
| | |\ \ \
| | | * | | backport from 6.0Gleb Shchepa2008-06-273-11/+77
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#35658 (An empty binary value leads to mysqld crash) Before this fix, the following token b'' caused the parser to crash when reading the binary value from the empty string. The crash was caused by: ptr+= max_length - 1; because max_length is unsigned and was 0, causing an overflow. With this fix, an empty binary literal b'' is parsed as a binary value 0, in Item_bin_string. mysql-test/r/varbinary.result: Bug#35658 (An empty binary value leads to mysqld crash) mysql-test/t/varbinary.test: Bug#35658 (An empty binary value leads to mysqld crash) sql/item.cc: Bug#35658 (An empty binary value leads to mysqld crash)
| | * | | Bug #20748: Configuration files should not be read more than onceTimothy Smith2008-06-241-155/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize directory names before adding them to default_directories. mysys/default.c: Normalize directory names with unpack_dirname() before adding them to default_directories. This way, /etc/ and /etc will not count as duplicates. Because this entails allocating memory to store the normalized names, add error handling and ensure that it doesn't leak memory in case both my_print_defaults() and load_defaults() are called. Clean up the Windows code that finds the exe's parent directory, and pull it out into a separate function. Reorganize the code into a single init_default_directories() function, with internal #ifdefs, instead of init_default_directories_<system>() functions which were accessed via a function pointer. This is more in line with normal MySQL coding style, and easier to read for some.
* | | | | Raise version number after cloning 5.0.67Jonathan Perkin2008-07-161-2/+2
| |_|_|/ |/| | |
* | | | Put version number back to 5.0.67Jonathan Perkin2008-07-161-2/+2
| | | |
* | | | Fixed packet-test bug caused by if block that didn't have curly braces.Chad MILLER2008-07-151-0/+2
| | | |
* | | | Merge from 5.0 trunk.Chad MILLER2008-07-14415-17917/+25610
|\ \ \ \
| * | | | Raise version number after cloning 5.0.66unknown2008-07-091-2/+2
| |/ / /
| * | | Merge from trunk.Jonathan Perkin2008-07-08173-6334/+12454
| |\ \ \
| | * | | Fix forMatthias Leich2008-06-303-5/+20
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#36787 Test funcs_1.charset_collation_1 failing Details: 1. Skip charset_collation_1 if charset "ucs2_bin" is missing (property which distincts "vanilla" builds from the others) 2. Let builds with version_comment LIKE "%Advanced%" (found them for 5.1) execute charset_collation_3. 3. Update comments charset_collation.inc so that they reflect the current experiences.
| | * | Fix forMatthias Leich2008-06-252-108/+180
| | | | | | | | | | | | | | | | | | | | | | | | Bug#37492 timing bug in subselect.test + similar weaknesses found during testing + replace error numbers by error names
| | * | back-port from 5.1.Gleb Shchepa2008-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#35480: BOM detection code crashes mysql CLI with zero-sized input MySQL client crashed if no input was passed to it.
| | * | back-port from 5.1.Gleb Shchepa2008-06-243-31/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#33812: mysql client incorrectly parsing DELIMITER Remove unnecessary and incorrect code that tried to pull delimiter commands out of the middle of statements.
| | * | Bug #36244: MySQL CLI doesn't recognize standalone -- Gleb Shchepa2008-06-242-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a commentary mysql client has been modified to interpret EOL after standalone -- commentary strings like whitespace character (according to http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html) mysql-test/t/mysql_delimiter.sql: Added test case for bug #36244.
| | * | Fix forMatthias Leich mleich@mysql.com2008-06-18104-5593/+8633
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Bug#37167 funcs_1: Many tests fail if the embedded server is used. Bug#37164 funcs_1: Some tests fail if an optional character set is missing. + some cleanup within the testsuite related to the fixes above + some adjustments to open bugs on Mac OS X
| | | * Fix forMatthias Leich mleich@mysql.com2008-06-16104-5593/+8633
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#37167 funcs_1: Many tests fail if the embedded server is used. Bug#37164 funcs_1: Some tests fail if an optional character set is missing. + some cleanup within the testsuite related to the fixes above + some adjustments to open bugs on Mac OS X Details: - Remove the initial loading of data from tests if these data are not somewhere retrieved - Remove any use of columns with attribute unicode (-> UCS2 is no more needed) from tests where unicode properties are not checked or somehow required - Create a separate branch of the Character maximum length test (CML). If UCS2 is available than this test gets applied to every available type of string column with attribute unicode This prevents any loss of coverage by the points above. - Disable the execution of is_tables_ndb which gives wrong results because of a bug. Correct the exepected results of this test. - In case of tests failing when applied to the embedded server 1) Create a variant of this test for the embedded server or 2) Skip the test in case of embedded server depending on purpose and complexity of test. - Skip the tests which could suffer from Bug 28309 First insert violates unique constraint - was "memory" table empty ? Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X (both bugs Mac OS X, embedded server, MySQL 5.0 only) - Minor improvements like remove typos
| | * | auto mergeGeorgi Kodinov2008-06-171-14/+36
| | |\ \
| | | * \ Merging bug fixes for 34995 and 35543 into the main tree,Joerg Bruehe2008-06-131-14/+36
| | | |\ \ | | | | | | | | | | | | | | | | | | and the build tag for 5.0.62.
| | | | * | No change - hack to force BZR conversionunknown2008-06-130-0/+0
| | | | | |
| | | | * | Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0unknown2008-05-2555-114/+1014
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M50/work-5.0 mysql-test/mysql-test-run.pl: Auto merged
| | | | * | | BUG#35543 mysqlbinlog.cc does not properly work with tmp filesunknown2008-05-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Backport to 5.0, use --local-load to instruct myqlbinlog where to put the files it generate mysql-test/mysql-test-run.pl: Make mysqlbinlog use the designated tmpdir for it's LOAD DATA files
| | | | * | | Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463unknown2008-05-022-1/+11
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build mysql-test/mysql-test-run.pl: Auto merged
| | | | * \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463unknown2008-05-021-1/+1
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
| | | | * \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463unknown2008-05-021-1/+1
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
| | | | * \ \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463unknown2008-05-021-2/+10
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build mysql-test/mysql-test-run.pl: Auto merged
| | | | * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-buildunknown2008-05-02550-65383/+76075
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build mysql-test/mysql-test-run.pl: Auto merged