summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge 5.5.27 into the tree for ULN RPMs.Joerg Bruehe2012-07-2592-1567/+2575
|\
| * Empty version change upmergeBjorn Munch2012-07-110-0/+0
| |\
| | * Raise version number after cloning 5.1.65unknown2012-07-111-1/+1
| | |
| * | (no commit message)unknown2012-07-110-0/+0
| | |
| * | (no commit message)unknown2012-07-110-0/+0
| | |
| * | Bug #13444084:PRIMARY KEY OR UNIQUE KEY >453 BYTES FAILS FORChaithra Gopalareddy2012-07-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COUNT DISTINCT GROUP BY PROBLEM: To calculate the final result of the count(distinct(select 1)) we call 'end_send' function instead of 'end_send_group'. 'end_send' cannot be called if we have aggregate functions that need to be evaluated. ANALYSIS: While evaluating for a possible loose_index_scan option for the query, the variable 'is_agg_distinct' is set to 'false' as the item in the distinct clause is not a field. But, we choose loose_index_scan by not taking this into consideration. So, while setting the final 'select_function' to evaluate the result, 'precomputed_group_by' is set to TRUE as in this case loose_index_scan is chosen and we do not have agg_distinct in the query (which is clearly wrong as we have one). As a result, 'end_send' function is chosen as the final select_function instead of 'end_send_group'. The difference between the two being, 'end_send_group' evaluates the aggregates while 'end_send' does not. Hence the wrong result. FIX: The variable 'is_agg_distinct' always represents if 'loose_idnex_scan' can be chosen for aggregate_distinct functions present in the select. So, we check for this variable to continue with loose_index_scan option. sql/opt_range.cc: Do not continue if is_agg_distinct is not set in case of agg_distinct functions.
| * | bug#11759333:Rohit Kalhans2012-07-101-16/+10
| | | | | | | | | | | | follow-up patch for the failure on pb2 windows build
| * | Bug#13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |HANDLE_FATAL_SIGNAL IN STRNLENMayank Prasad2012-07-101-2/+5
| | | | | | | | | | | | Follow up patch to resolve pb2 failure on windows platform
| * | Bug#12623923 Server can crash after failure to createJon Olav Hauglid2012-07-103-19/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | primary key with innodb tables The bug was triggered if a single ALTER TABLE statement both added and dropped indexes and ALTER TABLE failed during drop (e.g. because the index was needed in a foreign key constraint). In such cases, the server index information would get out of sync with InnoDB - the added index would be present inside InnoDB, but not in the server. This could then lead to InnoDB error messages and/or server crashes. The root cause is that new indexes are added before old indexes are dropped. This means that if ALTER TABLE fails while dropping indexes, index changes will be reverted in the server but not inside InnoDB. This patch fixes the problem by dropping any added indexes if drop fails (for ALTER TABLE statements that both adds and drops indexes). However, this won't work if we added a primary key as this key might not be possible to drop inside InnoDB. Therefore, we resort to the copy algorithm if a primary key is added by an ALTER TABLE statement that also drops an index. In 5.6 this bug is more properly fixed by the handler interface changes done in the scope of WL#5534 "Online ALTER".
| * | (no commit message)unknown2012-07-100-0/+0
| |\ \ | | |/
| | * (no commit message)unknown2012-07-100-0/+0
| | |
| * | BUG#11759333: SBR LOGGING WARNING MESSAGES FOR PRIMARYRohit Kalhans2012-07-101-5/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KEY UPDATES WITH A LIMIT OF 1 Problem: The unsafety warning for statements such as update...limit1 where pk=1 are thrown when binlog-format = STATEMENT,despite of the fact that such statements are actually safe. this leads to filling up of the disk space with false warnings. Solution: This is not a complete fix for the problem, but prevents the disks from getting filled up. This should therefore be regarded as a workaround. In the future this should be overriden by server general suppress/filtering framework. It should also be noted that another worklog is supposed to defeat this case's artificial unsafety. We use a warning suppression mechanism to detect warning flood, enable the suppression, and disable this when the average warnings/second has reduced to acceptable limits. Activation: The supression for LIMIT unsafe statements are activated when the last 50 warnings were logged in less than 50 seconds. Supression: Once activated this supression will prevent the individual warnings to be logged in the error log, but print the warning for every 50 warnings with the note: "The last warning was repeated N times in last S seconds" Noteworthy is the fact that this supression works only on the error logs and the warnings seen by the clients will remain as it is (i.e. one warning/ unsafe statement) Deactivation: The supression will be deactivated once the average # of warnings/sec have gone down to the acceptable limits. sql/sql_class.cc: Added code to supress warning while logging them to error-log.
| * | null-merge from 5.1.Andrei Elkin2012-07-100-0/+0
| |\ \ | | |/
| | * merge from 5.1 repo.Andrei Elkin2012-07-101-0/+1
| | |\
| | * \ merge from 5.1 repo.Andrei Elkin2012-07-105-9/+41
| | |\ \
| | * \ \ merge from 5.1 repo.Andrei Elkin2012-07-107-1356/+1391
| | |\ \ \
| * | \ \ \ merge from 5.5 repo.Andrei Elkin2012-07-108-1405/+1465
| |\ \ \ \ \
| | * \ \ \ \ null upmergeBjorn Munch2012-07-100-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | mysql_client_fw.c was not included in make distBjorn Munch2012-07-101-0/+1
| | | | |_|/ | | | |/| |
| | * | | | null upmergeBjorn Munch2012-07-100-0/+0
| | |\ \ \ \
| | | * | | | mysql_client_fw.c was not included in make distBjorn Munch2012-07-101-0/+1
| | | | |_|/ | | | |/| |
| | * | | | merge from 5.1 to 5.5Sujatha Sivakumar2012-07-105-9/+41
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | BUG#11762670:MY_B_WRITE RETURN VALUE IGNOREDSujatha Sivakumar2012-07-105-9/+41
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======= The return value from my_b_write is ignored by: `my_b_write_quoted', `my_b_write_bit',`Query_log_event::print_query_header' Most callers of `my_b_printf' ignore the return value. `log_event.cc' has many calls to it. Analysis: ======== `my_b_write' is used to write data into a file. If the write fails it sets appropriate error number and error message through my_error() function call and sets the IO_CACHE::error == -1. `my_b_printf' function is also used to write data into a file, it internally invokes my_b_write to do the write operation. Upon success it returns number of characters written to file and on error it returns -1 and sets the error through my_error() and also sets IO_CACHE::error == -1. Most of the event specific print functions for example `Create_file_log_event::print', `Execute_load_log_event::print' etc are the ones which make several calls to the above two functions and they do not check for the return value after the 'print' call. All the above mentioned abuse cases deal with the client side. Fix: === As part of bug fix a check for IO_CACHE::error == -1 has been added at a very high level after the call to the 'print' function. There are few more places where the return value of "my_b_write" is ignored those are mentioned below. +++ mysys/mf_iocache2.c 2012-06-04 07:03:15 +0000 @@ -430,7 +430,8 @@ memset(buffz, '0', minimum_width - length2); else memset(buffz, ' ', minimum_width - length2); - my_b_write(info, buffz, minimum_width - length2); +++ sql/log.cc 2012-06-08 09:04:46 +0000 @@ -2388,7 +2388,12 @@ { end= strxmov(buff, "# administrator command: ", NullS); buff_len= (ulong) (end - buff); - my_b_write(&log_file, (uchar*) buff, buff_len); At these places appropriate return value handlers have been added. client/mysqlbinlog.cc: check for IO_CACHE::error == -1 has been added after the call to the event specific print functions mysys/mf_iocache2.c: Added handler to check the written value of `my_b_write' sql/log.cc: Added handler to check the written value of `my_b_write' sql/log_event.cc: Added error simulation statements in `Create_file_log_event::print` and `Execute_load_query_log_event::print' sql/rpl_utility.h: Removed the extra ';'
| | * | | mysql_client_test did not build within limbysqld/examplesBjorn Munch2012-07-101-0/+1
| | |\ \ \ | | | |/ /
| | | * | mysql_client_test did not build within limbysqld/examplesBjorn Munch2012-07-102-2/+4
| | | | |
| | * | | Fixed compile error in mysql_client_test using gccBjorn Munch2012-07-091-1/+1
| | |\ \ \ | | | |/ /
| | | * | Fixed compile error in mysql_client_test using gccBjorn Munch2012-07-091-1/+1
| | | | |
| | * | | Refactor mysql_client_test.c into a framework part and a test partBjorn Munch2012-07-092-1396/+1423
| | |\ \ \ | | | |/ /
| | | * | Refactor mysql_client_test.c into a framework part and a test partBjorn Munch2012-07-093-1353/+1381
| | | | |
| | * | | (no commit message)unknown2012-07-060-0/+0
| | | | |
| * | | | (no commit message)unknown2012-07-060-0/+0
| | | | |
| * | | | merge from 5.5 repo.Andrei Elkin2012-07-065-3/+15
| |\ \ \ \ | | |/ / /
| | * | | Merge from mysql-5.5.25a-releaseSunanda Menon2012-07-061-2/+2
| | |\ \ \
| | | * | | Added some extra optional path to test suites.Joerg Bruehe2012-07-022-4/+8
| | | | | |
| | | * | | Fix mysql_plugin test to handle version XXaBjorn Munch2012-06-291-2/+2
| | | | | |
| | | * | | Bug#65745: UPDATE ON INNODB TABLE ENTERS RECURSIONJoerg Bruehe2012-06-282-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduction of cost based decision on filesort vs index for UPDATE statements changed detection of the fact that the index used to scan the table is being updated. The new design missed the case of index merge when there is no single index to check. That was worked until a recent change in InnoDB after which it went into infinite recursion if update of the used index wasn't properly detected. The fix consists of 'used key being updated' detection code from 5.1. Patch done by Evgeny Potemkin <evgeny.potemkin@oracle.com> and transferred into the 5.5.25a release build by Joerg Bruehe. This changeset is the difference between MySQL 5.5.25 and 5.5.25a. VERSION: Version number change. sql/sql_update.cc: Bug#65745: UPDATE ON INNODB TABLE ENTERS RECURSION The check for used key being updated is extended to cover the case when index merge is used.
| | * | | | Bug #12910665: AUTH-PLUGIN-DATA-LEN NOT TESTED FOR VALIDITY BY THE Georgi Kodinov2012-06-292-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CLIENT Added a check for a negative second part of the scramble length.
| | * | | | mergeGeorgi Kodinov2012-07-052-1/+6
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Bug #13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |Georgi Kodinov2012-07-052-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HANDLE_FATAL_SIGNAL IN STRNLEN Fixed the following bounds checking problems : 1. in check_if_legal_filename() make sure the null terminated string is long enough before accessing the bytes in it. Prevents pottential read-past-buffer-end 2. in my_wc_mb_filename() of the filename charset check for the end of the destination buffer before sending single byte characters into it. Prevents write-past-end-of-buffer (and garbaling stack in the cases reported here) errors. Added test cases.
| * | | | | merge bug14275000 fixes to 5.5: sql/log_event.h.Andrei Elkin2012-07-051-9/+1
| | | | | |
| * | | | | merge bug14275000 fixes to 5.5Andrei Elkin2012-07-052-5/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Bug#14275000Andrei Elkin2012-07-052-5/+22
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for BUG11761686 left a flaw that managed to slip away from testing. Only effective filtering branch was actually tested with a regression test added to rpl_filter_tables_not_exist. The reason of the failure is destuction of too early mem-root-allocated memory at the end of the deferred User-var's do_apply_event(). Fixed with bypassing free_root() in the deferred execution branch. Deallocation of created in do_apply_event() items is done by the base code through THD::cleanup_after_query() -> free_items() that the parent Query can't miss. sql/log_event.cc: Do not call free_root() in case the deferred User-var event. Necessary methods to the User-var class are added, do_apply_event() refined. sql/log_event.h: Necessary methods to avoid destoying mem-root-based memory at User-var applying are defined.
| * | | fixed a missing breakGeorgi Kodinov2012-07-051-0/+1
| | | |
| * | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5Georgi Kodinov2012-07-0511-14/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Clear text password client plugin disabled by default. 2. Added an environment variable LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN, that when set to something starting with '1', 'Y' or 'y' will enable the clear text plugin for all connections. 3. Added a new mysql_options() option : MYSQL_ENABLE_CLEARTEXT_PLUGIN that takes an my_bool argument. When the value of the argument is non-zero the clear text plugin is enabled for this connection only. 4. Added an enable-cleartext-plugin config file option that takes a numeric argument. If the numeric value of the numeric argument is non-zero the clear text plugin is enabled for the connection 5. Added a boolean command line option "--enable_cleartext_plugin" to mysql, mysqlslap and mysqladmin. When specified it will call mysql_options with the effect of #3 6. Added a new CLEARTEXT option to the connect command in mysqltest. When specified it will enable the cleartext plugin for usage. 7. Added test cases and updated existing ones that need the clear text plugin.
| * | | Bug #11753490: 44939: sql dumps containing broad views fail when Georgi Kodinov2012-07-042-30/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | executing The problem is that mysql lacks information about the objects a view depends on so it can't dump views and tables in the proper order. Thus it needs to create "stand-in" myisam tables for each view while dumping the tables that it later drops and replaces with the actual view view definition. But since views can have much more columns than an actual table creating these stand-in tables may be problematic. There's no way to portably find out how many columns an mysiam table can have. It's a complicated formula depending on internal server constants. Thus we can't have a reliable error check without repeating the logic and the formula inside mysqldump. 1. Changed the type of the columns of the stand-in tables mysqldump makes to satisfy view dependencies from the original type to smallint to save on row space. 2. Added a warning on the mysqldump's standard error for a possible problems replaying the dump file if the columns of a view exceed 1000. 3. Added a test case.
| * | | upmerge from mysql-5.1 to mysql-5.5Rohit Kalhans2012-07-031-0/+34
| |\ \ \ | | |/ /
| | * | BUG#11762667:MYSQLBINLOG IGNORES ERRORS WHILE WRITING OUTPUTRohit Kalhans2012-07-031-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a followup patch for the bug enabling the test i_binlog.binlog_mysqlbinlog_file_write.test this was disabled in mysql trunk and mysql 5.5 as in the release build mysqlbinlog was not debug compiled whereas the mysqld was. Since have_debug.inc script checks only for mysqld to be debug compiled, the test was not being skipped on release builds. We resolve this problem by creating a new inc file mysqlbinlog_have_debug.inc which checks exclusively for mysqlbinlog to be debug compiled. if not it skips the test. mysql-test/include/mysqlbinlog_have_debug.inc: new inc file to check if mysqlbinlog is debug compiled.
| * | | Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTEDMayank Prasad2012-07-032-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | Details: - Modified test case to make sure its run for all and not only for archive Storage Engine.
| * | | auto-mergeGleb Shchepa2012-06-292-2/+2
| |\ \ \ | | |/ /
| | * | minor update to make MSVS happyGleb Shchepa2012-06-292-2/+2
| | | |