|
------------------------------------------------------------
revno: 2977 tags: clone-5.5.2-m2-build committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug33248-3-5.5 timestamp: Fri 2010-02-12 17:41:00 +0100 message: Automerge from central "trunk-bugfixing". ------------------------------------------------------------ revno: 2904.5.13 committer: Evgeny Potemkin <epotemkin@mysql.com> branch nick: 50539-bug-trunk-bugfixing timestamp: Fri 2010-02-12 11:51:52 +0300 message: Bug#50539: Wrong result when loose index scan is used for an aggregate function with distinct. Loose index scan is used to find MIN/MAX values using appropriate index and thus allow to avoid grouping. For each found row it updates non-aggregated fields with values from row with found MIN/MAX value. Without loose index scan non-aggregated fields are copied by end_send_group function. With loose index scan there is no need in end_send_group and end_send is used instead. Non-aggregated fields still need to be copied and this was wrongly implemented in QUICK_GROUP_MIN_MAX_SELECT::get_next. WL#3220 added a case when loose index scan can be used with end_send_group to optimize calculation of aggregate functions with distinct. In this case the row found by QUICK_GROUP_MIN_MAX_SELECT::get_next might belong to a next group and copying it will produce wrong result. Update of non-aggregated fields is moved to the end_send function from QUICK_GROUP_MIN_MAX_SELECT::get_next. ------------------------------------------------------------ revno: 2904.5.12 committer: <Dao-Gang.Qu@sun.com> branch nick: mysql-trunk-bugfixing timestamp: Fri 2010-02-12 12:04:57 +0800 message: Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm The MDL_SHARED lock was introduced for an object in 5.4, but the 'TABLE_LIST' object was not initialized with the MDL_SHARED lock when applying event with LOAD DATA INFILE into table. So the failure is caused when checking the MDL_SHARED lock for the object. To fix the problem, the 'TABLE_LIST' object was initialized with the MDL_SHARED lock when applying event with LOAD DATA INFILE into table. ------------------------------------------------------------ revno: 2904.5.11 committer: Magne Mahre <magne.mahre@sun.com> branch nick: mysql-trunk-bugfixing-50574 timestamp: Thu 2010-02-11 18:25:34 +0100 message: Bug#50574 5.5.x allows spatial indexes on non-spatial columns, causing crashes! Adding a SPATIAL INDEX on a non-geometrical column caused a segmentation fault when the table was subsequently inserted into. A test was added in mysql_prepare_create_table to explicitly check whether non-geometrical columns are used in a spatial index, and throw an error if so. ------------------------------------------------------------ revno: 2904.5.10 committer: Magne Mahre <magne.mahre@sun.com> branch nick: mysql-trunk-bugfixing-50542 timestamp: Thu 2010-02-11 18:02:41 +0100 message: Bug#50542 5.5.x doesn't check length of key prefixes: corruption and crash results An index creation statement where the index key is larger/wider than the column it references should throw an error. A statement like: CREATE TABLE t1 (a CHAR(1), PRIMARY KEY (A(255))) did not error, but a segmentation fault followed when an insertion was attempted on the table The partial key validiation clause has been restructured to (hopefully) better document which uses of partial keys are valid. ------------------------------------------------------------ revno: 2904.5.9 committer: Luis Soares <luis.soares@sun.com> branch nick: mysql-trunk-bugfixing timestamp: Wed 2010-02-10 12:12:55 +0000 message: BUG#50984: check_testcase fails for rpl_tmp_table_and_DDL We found that there are some tests that are not cleaning up properly: 1. rpl_tmp_table_and_DDL 2. rpl_do_grant 3. rpl_sync For #1 and #2 we found that the slave would not, for some cases, replicate all the instructions the master processed in the cleanup section. We fix these by deploying some synchronization commands in the test cases so that slave processes all clean up instructions. As for #3, this is tracked as part of another bug (BUG@50442). ------------------------------------------------------------ revno: 2904.5.8 committer: Mattias Jonsson <mattias.jonsson@sun.com> branch nick: b50201-mysql-trunk-bugfixing_2 timestamp: Wed 2010-02-10 10:47:14 +0100 message: Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table Problem was that in mysql-trunk the ER() macro is now dependent on current_thd and the innodb monitor thread has no binding to that thd object. This cause the crash because of bad derefencing. Solution was to add a new macro which take the thd as an argument (which the innodb thread uses for the call). (Updated according to reviewers comments, i.e. added ER_THD_OR_DEFAULT and moved test to suite parts.) ------------------------------------------------------------ revno: 2904.5.7 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-bugfixing timestamp: Tue 2010-02-09 14:04:56 +0300 message: Auto-merge from mysql-trunk. ------------------------------------------------------------ revno: 2904.5.6 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-bugfixing timestamp: Fri 2010-02-05 18:43:22 +0300 message: Auto-merge from mysql-trunk. ------------------------------------------------------------ revno: 2904.5.5 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-bugfixing timestamp: Fri 2010-02-05 15:02:03 +0300 message: Auto-merge from mysql-trunk. ------------------------------------------------------------ revno: 2904.5.4 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: trunk-bugfixing timestamp: Thu 2010-02-04 12:47:42 +0800 message: Auto merge ------------------------------------------------------------ revno: 2904.6.1 committer: Luis Soares <luis.soares@sun.com> branch nick: mysql-trunk-bugfixing timestamp: Wed 2010-02-03 16:56:17 +0000 message: BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic fails in PB sporadically) The IO thread can concurrently access the relay log IO_CACHE while another thread is performing an FLUSH LOGS procedure. FLUSH LOGS closes and reopens the relay log and while doing so it (re)initializes its IO_CACHE. During this procedure the IO_CACHE mutex is also reinitialized, which can cause problems if some other thread (namely the IO THREAD) is concurrently accessing it at the time . This patch fixes the problem by extending the interface of the flush_master_info function to also include a second paramater, "need_relay_log_lock", stating whether the thread should grab the relay log lock or not before actually flushing the relay log. Also, IO thread now calls flush_master_info with this flag set when it flushes master info with in the event read_event loop. Finally, we also increase loop time in rpl_heartbeat_basic test case, so that the number of calls to flush logs doubles, stressing this part of the code a little more. ------------------------------------------------------------ revno: 2904.5.3 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: trunk-bugfixing timestamp: Thu 2010-02-04 12:37:56 +0800 message: Auto merge from 5.1-rep-semisync ------------------------------------------------------------ revno: 2661.512.1 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 5.1-rep-semisync timestamp: Thu 2010-02-04 12:14:32 +0800 message: Bug#49894 shifted MYSQL_REPLICATION_PLUGIN number The number for MYSQL_REPLICATION_PLUGIN was shifted when backporting because MYSQL_AUDIT_PLUGIN was not backported. This problem is fixed by backporting only the number of audit plugin and print an error when trying to load audit plugins. Note that replication plugins compiled against old MYSQL_REPLICATION_PLUGIN number will also be recognized as audit plugin and be rejected. ------------------------------------------------------------ revno: 2904.5.2 committer: <Li-Bing.Song@sun.com> branch nick: mysql-trunk-bugfixing timestamp: Sun 2010-01-31 03:14:29 +0800 message: Auto Merge fix for bug#50157 ------------------------------------------------------------ revno: 2661.492.5 committer: <Li-Bing.Song@sun.com> branch nick: mysql-5.1-rep-semisync timestamp: Sun 2010-01-31 02:26:51 +0800 message: BUG#50157 Assertion !active_tranxs_->is_tranx_end_pos(..) in ReplSemiSyncMaster::commitTrx The root cause of the crash is that a TranxNode is freed before it is used. A TranxNode is allocated and inserted into the active list each time a log event is written and flushed into the binlog file. The memory for TranxNode is allocated with thd_alloc and will be freed at the end of the statement. The after_commit/after_rollback callback was supposed to be called before the end of each statement and remove the node from the active list. However this assumption is not correct in all cases(e.g. call 'CREATE TEMPORARY TABLE myisam_t SELECT * FROM innodb_t' in a transaction and delete all temporary tables automatically when a session closed), and can cause the memory allocated for TranxNode be freed before it was removed from the active list. So The TranxNode pointer in the active list would become a wild pointer and cause the crash. After this patch, We have a class called a TranxNodeAllocate which manages the memory for allocating and freeing TranxNode. It uses my_malloc to allocate memory. ------------------------------------------------------------ revno: 2661.492.4 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 5.1-rep-semisync timestamp: Fri 2009-12-04 13:46:06 +0800 message: Auto merge postfix of Bug#49020 ------------------------------------------------------------ revno: 2661.492.3 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 5.1-rep-semisync timestamp: Fri 2009-12-04 10:05:43 +0800 message: Auto Merge fix for Bug#49170 ------------------------------------------------------------ revno: 2661.511.1 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 5.1-rep-semisync timestamp: Fri 2009-12-04 09:43:39 +0800 message: Bug#49170 Inconsistent placement of semisync plugin prevents it from getting tested Add $basedir/lib/plugin to the search paths for semisync plugins. ------------------------------------------------------------ revno: 2661.492.2 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 5.1-rep-semisync timestamp: Fri 2009-12-04 10:04:14 +0800 message: Auto merge fix for Bug#49020 ------------------------------------------------------------ revno: 2904.5.1 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-bugfixing timestamp: Thu 2009-12-24 10:30:04 +0300 message: Auto-merge from mysql-trunk. ------------------------------------------------------------ revno: 2976 committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug33248-3-5.5 timestamp: Fri 2010-02-12 17:26:22 +0100 message: Upmerge the RPM spec file correction: "release" was missing. ------------------------------------------------------------ revno: 2661.510.2 committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug33248-3-5.1 timestamp: Fri 2010-02-12 17:23:22 +0100 message: Correction: The "release" setting had got lost in the RPM spec file. ------------------------------------------------------------ revno: 2975 committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug33248-3-5.5 timestamp: Fri 2010-02-12 13:20:42 +0100 message: Upmerge the spec file alignment from 5.1 to 5.5, no other functional changes. ------------------------------------------------------------ revno: 2661.510.1 committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug33248-3-5.1 timestamp: Thu 2010-02-11 21:33:48 +0100 message: Upmerge changes done to the generic spec file in 5.0 to 5.1, this includes a major whitespace (formatting) alignment and sequence changes to better agree with other spec files. Further changes: - All features are controlled by "%define" set from call options or builtin. - "bundled zlib" is on by default. - "with libgcc" is controlled by runtime detection of gcc. - Handling of "CFLAGS" and "CXXFLAGS" is more concentrated. - Several missing man pages were added. ------------------------------------------------------------ revno: 1810.3981.2 committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug33248-3-5.0 timestamp: Tue 2010-02-02 17:53:52 +0100 message: Cleanup in the RPM spec file: Get rid of trailing blanks. ------------------------------------------------------------ revno: 1810.3981.1 committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug33248-3-5.0 timestamp: Tue 2010-02-02 16:28:59 +0100 message: Spec file for "generic" RPMs: Cleanup, formatting improvements, vendor is Sun (since MySQL AB was bought). Backport the change so that RPM doesn't magically create a dependency on "Perl-DBI". ------------------------------------------------------------ revno: 2974 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk timestamp: Tue 2010-02-09 13:10:36 +0300 message: Fix ndb_dd_ddl.test: drop created database after use. ------------------------------------------------------------ revno: 2973 committer: Joerg Bruehe <joerg@mysql.com> branch nick: mysql-5.5 timestamp: Mon 2010-02-08 22:16:07 +0100 message: Upmerge "configure.in" text change from 5.1 to 5.5 ("trunk"), fixing bug#50950. ------------------------------------------------------------ revno: 2661.504.30 committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug50950-5.1 timestamp: Mon 2010-02-08 21:40:17 +0100 message: Upmerge "configure.in" text change from 5.0 to 5.1, fixing bug#50950. ------------------------------------------------------------ revno: 1810.3980.8 committer: Joerg Bruehe <joerg@mysql.com> branch nick: bug50950-5.0 timestamp: Mon 2010-02-08 21:10:37 +0100 message: Bug#50950 Obsolete reference to www.mysql.com in message printed at end of configure New text for the success message of "configure". ------------------------------------------------------------ revno: 2972 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Fri 2010-02-05 18:31:06 +0300 message: Cherry-pick merge from mysql-5.1-bugteam. Original revision: ------------------------------------------------------------ revision-id: kent.boortz@sun.com-20100204182709-dw1dwpglkd5qrehb committer: Kent Boortz <kent.boortz@sun.com> branch nick: mysql-5.1-bugteam timestamp: Thu 2010-02-04 19:27:09 +0100 message: LT_INIT and LT_PREREQ was added in libtool 2.2 2008, a bit too recent, switched back to the older AC_PROG_LIBTOOL ------------------------------------------------------------ ------------------------------------------------------------ revno: 2971 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Fri 2010-02-05 18:14:01 +0300 message: Manual merge (empty) from mysql-5.1. ------------------------------------------------------------ revno: 2661.504.29 author: hery.ramilison@sun.com committer: MySQL Build Team <build@mysql.com> branch nick: mysql-5.1 timestamp: Thu 2010-02-04 12:23:33 +0100 message: Raise version number after cloning 5.1.44 ------------------------------------------------------------ revno: 2661.504.28 tags: clone-5.1.44-build committer: Georgi Kodinov <joro@sun.com> branch nick: merge-5.1-bugteam timestamp: Thu 2010-02-04 12:14:44 +0200 message: merge ------------------------------------------------------------ revno: 1810.3980.7 committer: Georgi Kodinov <joro@sun.com> branch nick: merge-5.0-bugteam timestamp: Thu 2010-02-04 12:13:29 +0200 message: tree name change ------------------------------------------------------------ revno: 2661.504.27 committer: Georgi Kodinov <joro@sun.com> branch nick: merge-5.1-bugteam timestamp: Wed 2010-02-03 17:27:55 +0200 message: merge ------------------------------------------------------------ revno: 1810.3980.6 committer: Georgi Kodinov <joro@sun.com> branch nick: merge-5.0-bugteam timestamp: Wed 2010-02-03 17:05:06 +0200 message: merge ------------------------------------------------------------ revno: 1810.3975.23 author: sunanda.menon@sun.com committer: MySQL Build Team <build@mysql.com> branch nick: mysql-5.0 timestamp: Fri 2010-01-15 10:35:35 +0100 message: Raise version number after cloning 5.0.90 ------------------------------------------------------------ revno: 2661.504.26 committer: Georgi Kodinov <joro@sun.com> branch nick: merge-5.1-bugteam timestamp: Wed 2010-02-03 17:25:29 +0200 message: merge ------------------------------------------------------------ revno: 2661.509.1 author: karen.langford@sun.com committer: MySQL Build Team <build@mysql.com> branch nick: mysql-5.1 timestamp: Fri 2010-01-15 18:03:48 +0100 message: Raise version number after cloning 5.1.43 ------------------------------------------------------------ revno: 2970 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Wed 2010-02-03 20:22:58 +0300 message: Manual merge from mysql-5.1-bugteam. Conflicts: - configure.in - mysql-test/include/setup_fake_relay_log.inc - sql/sql_select.cc ------------------------------------------------------------ revno: 2661.504.25 committer: Kent Boortz <kent.boortz@sun.com> branch nick: mysql-5.1-bugteam timestamp: Wed 2010-02-03 14:52:11 +0100 message: Adjuster the parsing of "configure.in" version number line ------------------------------------------------------------ revno: 2661.504.24 committer: Luis Soares <luis.soares@sun.com> branch nick: mysql-5.1-bugteam-push timestamp: Wed 2010-02-03 12:12:51 +0000 message: automerge mysql-5.1-bugteam bug clone --> mysql-5.1-bugteam latest. ------------------------------------------------------------ revno: 2661.508.1 committer: Luis Soares <luis.soares@sun.com> branch nick: mysql-5.1-bugteam timestamp: Tue 2010-02-02 15:16:47 +0000 message: BUG#47639: The rpl_binlog_corruption test fails on Windows The test case rpl_binlog_corruption fails on windows because when adding a line to the binary log index file it gets terminated with a CR+LF (which btw, is the normal case in windows, but not on Unixes - LF). This causes mismatch between the relay log names, causing mysqld to report that it cannot find the log file. We fix this by creating the instrumented index file through mysql, ie, using SELECT ... INTO DUMPFILE ..., as opposed on relying on ultimatly OS commands like: -- echo "..." > index. These changes go into the file and make the procedure platform independent: include/setup_fake_relay_log.inc Side note: when using SELECT ... INTO DUMPFILE ..., one needs to check if mysqld is running with secure_file_priv. If it is, we do it in two steps: 1. create the file on the allowed location; 2. move it to the datadir. If it is not, then we just create the file directly on the datadir (so previous step 2. is not needed). ------------------------------------------------------------ revno: 2661.504.23 committer: Kent Boortz <kent.boortz@sun.com> branch nick: mysql-5.1-bugteam timestamp: Tue 2010-02-02 23:29:14 +0100 message: Changes to be able to create source TAR packages with longer path names than 99 characters, using the USTAR format of the resulting source TAR. To be able to specify the use of USTAR when creating the source TAR, we needed both to update the GNU autotools version requirements slightly, and update the initiation of the tools to use more modern constructs. ------------------------------------------------------------ revno: 2661.504.22 committer: Georgi Kodinov <joro@sun.com> branch nick: B50276-5.1-bugteam timestamp: Thu 2010-01-21 17:14:10 +0200 message: Bug #50276: Security flaw in INFORMATION_SCHEMA.TABLES check_access() returning false for a database does not guarantee that the access is granted to it. This wrong condition in filling the INFORMATION_SCHEMA tables causes extra tables to be returned to the user even if he has no rights to see them. Fixed by correcting the condition. ------------------------------------------------------------ revno: 2661.504.21 committer: Georgi Kodinov <joro@sun.com> branch nick: B49445-5.1-bugteam timestamp: Tue 2010-02-02 18:37:56 +0200 message: Bug #49445: Assertion failed: 0, file .\item_row.cc, line 55 with fulltext search and row op. The search for fulltext indexes is searching for some special predicate layouts. While doing so it's not checking for the number of columns of the expressions it tries to calculate. And since row expressions can't return a single scalar value there was a crash. Fixed by checking if the expressions are scalar (in addition to being constant) before calling Item::val_xxx() methods. ------------------------------------------------------------ revno: 2969 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Wed 2010-02-03 19:28:40 +0300 message: Manual merge from mysql-5.1-bugteam. Conflicts: - sql/mysqld.cc ------------------------------------------------------------ revno: 2661.504.20 committer: Magne Mahre <magne.mahre@sun.com> branch nick: mysql-5.1-bugteam timestamp: Tue 2010-02-02 16:34:32 +0100 message: Cleanup fix for WL#5154 that splits commands handling for --default-character-set and --character-set-server such that only the first will give a deprecation warning. Apart from that, the two options should do the same. ------------------------------------------------------------ revno: 2968 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Wed 2010-02-03 17:01:48 +0300 message: Manual merge from mysql-5.1-bugteam. Conflicts: - mysql-test/collections/default.experimental - mysql-test/suite/rpl/r/rpl_sp.result ------------------------------------------------------------ revno: 2661.504.19 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-5.1-bugteam timestamp: Tue 2010-02-02 16:38:44 +0300 message: Revert a patch for Bug#48231, which introduced valgrind warnings. Original revision: ------------------------------------------------------------ revision-id: li-bing.song@sun.com-20100130124925-o6sfex42b6noyc6x parent: joro@sun.com-20100129145427-0n79l9hnk0q43ajk committer: <Li-Bing.Song@sun.com> branch nick: mysql-5.1-bugteam timestamp: Sat 2010-01-30 20:49:25 +0800 message: Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; REVOKE/GRANT; ALTER EVENT. The following statements support the CURRENT_USER() where a user is needed. DROP USER RENAME USER CURRENT_USER() ... GRANT ... TO CURRENT_USER() REVOKE ... FROM CURRENT_USER() ALTER DEFINER = CURRENT_USER() EVENT but, When these statements are binlogged, CURRENT_USER() just is binlogged as 'CURRENT_USER()', it is not expanded to the real user name. When slave executes the log event, 'CURRENT_USER()' is expand to the user of slave SQL thread, but SQL thread's user name always NULL. This breaks the replication. After this patch, All above statements are rewritten when they are binlogged. The CURRENT_USER() is expanded to the real user's name and host. ------------------------------------------------------------ ------------------------------------------------------------ revno: 2661.504.18 committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: mysql-5.1-bugteam timestamp: Tue 2010-02-02 11:17:58 -0200 message: Fix for valgrind warning: check whether pointer was initialized. ------------------------------------------------------------ revno: 2661.504.17 committer: Georgi Kodinov <joro@sun.com> branch nick: fix-5.1-bugteam timestamp: Tue 2010-02-02 14:17:21 +0200 message: fixed various pb2 test failures on windows. ------------------------------------------------------------ revno: 2661.504.16 committer: Georgi Kodinov <joro@sun.com> branch nick: test-5.1-bugteam timestamp: Mon 2010-02-01 14:05:21 +0200 message: Made outfile_testdata experimental in 5.1-bugteam, pending the resulution of bug #46895. ------------------------------------------------------------ revno: 2661.504.15 committer: Georgi Kodinov <joro@sun.com> branch nick: test-5.1-bugteam timestamp: Mon 2010-02-01 13:50:30 +0200 message: merge ------------------------------------------------------------ revno: 1810.3980.5 committer: Georgi Kodinov <joro@sun.com> branch nick: test-5.0-bugteam timestamp: Mon 2010-02-01 13:40:16 +0200 message: fixed a typo in bug #49897. ------------------------------------------------------------ revno: 2967 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Sun 2010-01-31 14:38:55 +0300 message: Mark some tests experimental. ------------------------------------------------------------ revno: 2966 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Sun 2010-01-31 00:08:20 +0300 message: Fix Windows build failure (after manual merge from 5.1-bugteam). ------------------------------------------------------------ revno: 2965 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Sat 2010-01-30 22:13:36 +0300 message: Manual merge from mysql-5.1-bugteam. Conflicts: - mysql-test/collections/default.experimental - mysql-test/suite/rpl/r/rpl_binlog_grant.result - mysql-test/suite/rpl/r/rpl_sp.result - mysql-test/suite/rpl/t/rpl_binlog_grant.test - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test ------------------------------------------------------------ revno: 2661.504.14 committer: <Li-Bing.Song@sun.com> branch nick: mysql-5.1-bugteam timestamp: Sat 2010-01-30 20:49:25 +0800 message: Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER; REVOKE/GRANT; ALTER EVENT. The following statements support the CURRENT_USER() where a user is needed. DROP USER RENAME USER CURRENT_USER() ... GRANT ... TO CURRENT_USER() REVOKE ... FROM CURRENT_USER() ALTER DEFINER = CURRENT_USER() EVENT but, When these statements are binlogged, CURRENT_USER() just is binlogged as 'CURRENT_USER()', it is not expanded to the real user name. When slave executes the log event, 'CURRENT_USER()' is expand to the user of slave SQL thread, but SQL thread's user name always NULL. This breaks the replication. After this patch, All above statements are rewritten when they are binlogged. The CURRENT_USER() is expanded to the real user's name and host. ------------------------------------------------------------ revno: 2661.504.13 committer: Georgi Kodinov <joro@sun.com> branch nick: fix-certs-5.1-bugteam timestamp: Fri 2010-01-29 16:54:27 +0200 message: merge ------------------------------------------------------------ revno: 1810.3980.4 committer: Georgi Kodinov <joro@sun.com> branch nick: fix-certs-5.0-bugteam timestamp: Fri 2010-01-29 15:55:46 +0200 message: Bug #50642 : ssl certs in test suite are expiring soon. Updated the certs to expire on 2015. Made sure they work with both yassl and openssl. ------------------------------------------------------------ revno: 2661.504.12 committer: Tor Didriksen <tor.didriksen@sun.com> branch nick: 5.1-bugteam-bug50271 timestamp: Thu 2010-01-28 12:10:57 +0100 message: Bug #50271: Debug output of JOIN structures is garbled ------------------------------------------------------------ revno: 2661.504.11 committer: Ramil Kalimullin <ramil@mysql.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-29 15:08:49 +0400 message: Auto-merge. ------------------------------------------------------------ revno: 1810.3980.3 committer: Ramil Kalimullin <ramil@mysql.com> branch nick: b49897-5.0-bugteam timestamp: Fri 2010-01-29 13:17:57 +0400 message: Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL column is used for ORDER BY Problem: filesort isn't meant for null length sort data (e.g. char(0)), that leads to a server crash. Fix: disregard sort order if sort data record length is 0 (nothing to sort). ------------------------------------------------------------ revno: 2661.504.10 committer: Georgi Kodinov <joro@sun.com> branch nick: B49552-5.1-bugteam timestamp: Fri 2010-01-29 11:36:28 +0200 message: Bug #49552 : sql_buffer_result cause crash + not found records in multitable delete/subquery SQL_BUFFER_RESULT should not have an effect on non-SELECT statements according to our documentation. Fixed by not passing it through to multi-table DELETE (similarly to how it's done for multi-table UPDATE). ------------------------------------------------------------ revno: 2661.504.9 committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: mysql-5.1-bugteam timestamp: Thu 2010-01-28 19:51:40 -0200 message: Fix for compiler warnings: Rename method as to not hide a base. Reorder attributes initialization. Remove unused variable. Rework code to silence a warning due to assignment used as truth value. ------------------------------------------------------------ revno: 2661.504.8 committer: Andrei Elkin <aelkin@mysql.com> branch nick: 5.1-bt-bug47142-until4x timestamp: Thu 2010-01-28 12:22:19 +0200 message: merging from 5.1-bt to a local bugfix branch ------------------------------------------------------------ revno: 2661.507.5 committer: Bjorn Munch <Bjorn.Munch@sun.com> branch nick: timenv-bt timestamp: Wed 2010-01-27 16:32:59 +0100 message: Bug #49210 Enable MTR timeout configuration through environment variables Define env. vars for both timeout settings Also incorporated 5.0 patch into mtr version 1 ------------------------------------------------------------ revno: 1810.3980.2 committer: Bjorn Munch <Bjorn.Munch@sun.com> branch nick: timenv-50 timestamp: Wed 2010-01-27 15:21:41 +0100 message: Bug #49210 Enable MTR timeout configuration through environment variables Define env. vars for both timeout settings This patch is for 5.0 (mtr v1) and should replaces for 5.1 up ------------------------------------------------------------ revno: 2661.504.7 committer: Andrei Elkin <aelkin@mysql.com> branch nick: 5.1-bt-bug47142-until4x timestamp: Thu 2010-01-28 11:51:57 +0200 message: merging from 5.1-bt to a local bugfix branch ------------------------------------------------------------ revno: 2661.507.4 committer: Staale Smedseng <staale.smedseng@sun.com> branch nick: 49223-51 timestamp: Wed 2010-01-27 16:13:39 +0100 message: Bug #49223 Change help description for mysqldump --extended-insert Help message changed to the same as in the 5.1 online documentation. ------------------------------------------------------------ revno: 2661.507.3 committer: Magne Mahre <magne.mahre@sun.com> branch nick: mysql-5.1-bugteam-wl5182 timestamp: Wed 2010-01-27 13:23:28 +0100 message: WL#5182 Remove more deprecated 4.1/5.0 features WL#5182 is a follow-up to WL#5154, deprecating a few more options and system variables. ------------------------------------------------------------ revno: 2661.507.2 committer: Staale Smedseng <staale.smedseng@sun.com> branch nick: 50409-51 timestamp: Wed 2010-01-27 11:42:20 +0100 message: Merging from 5.0-bugteam ------------------------------------------------------------ revno: 1810.3980.1 committer: Staale Smedseng <staale.smedseng@sun.com> branch nick: 50409-50 timestamp: Wed 2010-01-27 11:38:50 +0100 message: Bug#50409 Solaris 8 compatibility broken by assumption about printstack() being present When Bug#47391 was fixed, no assumption was made that support for Solaris 8 was needed. Solaris 8 lacks printstack(), and the build breaks because of this. This patch adds a test for the presence of printstack() to configure.in for 5.0, and uses HAVE_PRINTSTACK to make decisions rather than the __sun define. ------------------------------------------------------------ revno: 2661.507.1 committer: <Dao-Gang.Qu@sun.com> branch nick: mysql-5.1-bugteam timestamp: Wed 2010-01-27 10:52:13 +0800 message: Bug #49191 rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed The 'rpl_get_master_version_and_clock' test verifies if the slave I/O thread tries to reconnect to master when it tries to get the values of the UNIX_TIMESTAMP, SERVER_ID from master under network disconnection. So the master server is restarted for making the transient network disconnection, during the period the COM_REGISTER_SLAVE failures are produced in server log file when the slave I/O thread tries to register on master. To fix the problem, suppress COM_REGISTER_SLAVE failures in server log file by mtr suppression, because they are expected. ------------------------------------------------------------ revno: 2661.504.6 committer: Andrei Elkin <aelkin@mysql.com> branch nick: 5.1-bt-bug47142-until4x timestamp: Wed 2010-01-27 19:27:49 +0200 message: bug#47142 merging patches prepared for 5.0 to 5.1-bt. That caused a few changes in the test file ------------------------------------------------------------ revno: 1810.3979.2 committer: Andrei Elkin <aelkin@mysql.com> branch nick: 5.0-bt-bug47142-until_catches_local_rotate-andrii timestamp: Wed 2010-01-27 15:20:03 +0200 message: bug#47142 improving comments ------------------------------------------------------------ revno: 1810.3979.1 committer: Andrei Elkin <aelkin@mysql.com> branch nick: 5.0-bt-bug47142-until_catches_local_rotate-andrii timestamp: Mon 2010-01-25 17:46:48 +0200 message: Bug #47142 "slave start until" stops 1 event too late in 4.1 to 5.0 replication When replicating from 4.1 master to 5.0 slave START SLAVE UNTIL can stop too late. The necessary in calculating of the beginning of an event the event's length did not correspond to the master's genuine information at the event's execution time. That piece of info was changed at the event's relay-logging due to binlog_version<4 event conversion by IO thread. Fixed with storing the master genuine Query_log_event size into a new status variable at relay-logging of the event. The stored info is extacted at the event execution and participate further to caclulate the correct start position of the event in the until-pos stopping routine. The new status variable's algorithm will be only active when the event comes from the master of version < 5.0 (binlog_version < 4). ------------------------------------------------------------ revno: 2661.504.5 committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: 49491-5.1 timestamp: Tue 2010-01-26 15:05:19 -0200 message: Bug#49491: Much overhead for MD5() and SHA1() on short strings MySQL's hash functions MD5 and SHA relied on the somewhat slow sprintf function to convert the digests to hex representations. This patch replaces the sprintf with a specific and inline hex conversion function. Patch contributed by Jan Steemann. ------------------------------------------------------------ revno: 2661.504.4 committer: Luis Soares <luis.soares@sun.com> branch nick: mysql-5.1-bugteam-push timestamp: Tue 2010-01-26 08:55:22 +0000 message: automerge: mysql-5.1-bugteam branch --> mysql-5.1-bugteam latest NOTE: added TODO to the comments requested by reviewer during this merge. ------------------------------------------------------------ revno: 2661.506.1 committer: Luis Soares <luis.soares@sun.com> branch nick: mysql-5.1-bugteam timestamp: Thu 2010-01-21 17:20:24 +0000 message: BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: cant find record Some engines return data for the record. Despite the fact that the null bit is set for some fields, their old value may still in the row. This can happen when unpacking an AI from the binlog on top of a previous record in which a field is set to NULL, which previously contained a value. Ultimately, this may cause the comparison of records to fail when the slave is doing an index or range scan. We fix this by deploying a call to reset() for each field that is set to null while unpacking a row from the binary log. Furthermore, we also add mixed mode test case to cover the scenario where updating and setting a field to null through a Query event and later searching it through a rows event will succeed. Finally, we also change the reset() method, from Field_bit class, so that it takes into account bits stored among the null bits and not only the ones stored in the record. ------------------------------------------------------------ revno: 2661.504.3 committer: Georgi Kodinov <joro@sun.com> branch nick: fix-win-5.1-bugteam timestamp: Tue 2010-01-26 10:47:43 +0200 message: fix a windows test run bug with debug binaries : dbug frame should be exited before destroying the thread local storage. ------------------------------------------------------------ revno: 2964 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Sat 2010-01-30 21:47:11 +0300 message: Manual merge from mysql-5.1-bugteam. Conflicts: - sql/mysql_priv.h ------------------------------------------------------------ revno: 2661.504.2 committer: <Dao-Gang.Qu@sun.com> branch nick: mysql-5.1-bugteam timestamp: Mon 2010-01-25 10:55:05 +0800 message: Manual merge with Conflicts: sql_udf.cc ------------------------------------------------------------ revno: 2661.490.53 committer: He Zhenxing <zhenxing.he@sun.com> branch nick: 5.1-bugteam-new timestamp: Sun 2010-01-24 15:03:23 +0800 message: Backport Bug#37148 to 5.1 ------------------------------------------------------------ revno: 2963 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Sat 2010-01-30 21:29:21 +0300 message: Null-merge from mysql-5.1-bugteam. ------------------------------------------------------------ revno: 2661.490.52 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 16:26:17 +0400 message: Merge InnoDB snapshot with mysql-5.1-bugteam. ------------------------------------------------------------ revno: 2661.505.8 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 16:23:27 +0400 message: Applying InnoDB snapshot, fixes BUG#49396. Detailed revision comments: r6471 | calvin | 2010-01-16 01:43:27 +0200 (Sat, 16 Jan 2010) | 4 lines branches/5.1: fix bug#49396: main.innodb test fails in embedded mode Change replace_result by using $MYSQLD_DATADIR. Tested in both embedded mode and normal server mode. ------------------------------------------------------------ revno: 2661.505.7 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 14:20:08 +0400 message: Disabled innodb-autoinc-44030 due to BUG#47621. ------------------------------------------------------------ revno: 2661.505.6 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 14:03:52 +0400 message: Applying InnoDB snapshot Detailed revision comments: r6492 | sunny | 2010-01-21 09:38:35 +0200 (Thu, 21 Jan 2010) | 1 line branches/5.1: Add reference to bug#47621 in the comment. ------------------------------------------------------------ revno: 2661.505.5 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 14:03:18 +0400 message: Applying InnoDB snapshot Detailed revision comments: r6489 | sunny | 2010-01-21 02:57:50 +0200 (Thu, 21 Jan 2010) | 2 lines branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test into a separate test/result files. ------------------------------------------------------------ revno: 2661.505.4 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 14:02:17 +0400 message: Applying InnoDB snapshot Detailed revision comments: r6488 | sunny | 2010-01-21 02:55:08 +0200 (Thu, 21 Jan 2010) | 2 lines branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test into a separate test/result files. ------------------------------------------------------------ revno: 2661.505.3 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 13:57:02 +0400 message: Applying InnoDB snapshot, fixes BUG#46193. Detailed revision comments: r6424 | marko | 2010-01-12 12:22:19 +0200 (Tue, 12 Jan 2010) | 16 lines branches/5.1: In innobase_initialize_autoinc(), do not attempt to read the maximum auto-increment value from the table if innodb_force_recovery is set to at least 4, so that writes are disabled. (Bug #46193) innobase_get_int_col_max_value(): Move the function definition before ha_innobase::innobase_initialize_autoinc(), because that function now calls this function. ha_innobase::innobase_initialize_autoinc(): Change the return type to void. Do not attempt to read the maximum auto-increment value from the table if innodb_force_recovery is set to at least 4. Issue ER_AUTOINC_READ_FAILED to the client when the auto-increment value cannot be read. rb://144 by Sunny, revised by Marko ------------------------------------------------------------ revno: 2661.505.2 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 13:56:32 +0400 message: Applying InnoDB snapshot Detailed revision comments: r6422 | marko | 2010-01-12 11:34:27 +0200 (Tue, 12 Jan 2010) | 3 lines branches/5.1: Non-functional change: Make innobase_get_int_col_max_value() a static function. It does not access any fields of class ha_innobase. ------------------------------------------------------------ revno: 2661.505.1 committer: Sergey Vojtovich <svoj@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 13:55:50 +0400 message: Applying InnoDB snapshot, fixes BUG#49238. Detailed revision comments: r6421 | jyang | 2010-01-12 07:59:16 +0200 (Tue, 12 Jan 2010) | 8 lines branches/5.1: Fix bug #49238: Creating/Dropping a temporary table while at 1023 transactions will cause assert. Handle possible DB_TOO_MANY_CONCURRENT_TRXS when deleting metadata in row_drop_table_for_mysql(). rb://220, approved by Marko ------------------------------------------------------------ revno: 2962 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Sat 2010-01-30 21:27:06 +0300 message: Auto-merge from mysql-5.1-bugteam. ------------------------------------------------------------ revno: 2661.504.1 committer: <Dao-Gang.Qu@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 17:38:21 +0800 message: Bug #49132 Replication failure on temporary table + DDL In RBR, DDL statement will change binlog format to non row-based format before it is binlogged, but the binlog format was not be restored, and then manipulating a temporary table can not reset binlog format to row-based format rightly. So that the manipulated statement is binlogged with statement-based format. To fix the problem, restore the state of binlog format after the DDL statement is binlogged. ------------------------------------------------------------ revno: 2961 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Thu 2010-01-28 21:49:00 +0300 message: Make the following tests experimental: - main.outfile_loaddata @solaris due to Bug#46895 - main.signal_demo3 @solaris due to Bug#47791 - main.sp @solaris due to Bug#47791 - rpl.rpl_slave_load_remove_tmpfile @windows due to Bug#50474 ------------------------------------------------------------ revno: 2960 committer: Alexey Kopytov <Alexey.Kopytov@Sun.com> branch nick: mysql-trunk-merge timestamp: Sun 2010-01-24 00:09:23 +0300 message: Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. ------------------------------------------------------------ revno: 2661.490.51 committer: Sergey Glukhov <Sergey.Glukhov@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 14:58:21 +0400 message: Bug#49501 Inefficient information_schema check (system collation), addon removed wrongly introduced strlen calls ------------------------------------------------------------ revno: 2661.490.50 committer: Magne Mahre <magne.mahre@sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-01-22 10:37:44 +0100 message: Post-commit fix of two tests The WL#5154 commit added a couple of warning messages that was not fixed in the result files for two RPL tests. ------------------------------------------------------------ revno: 2661.490.49 committer: Magne Mahre <magne.mahre@sun.com> branch nick: mysql-5.1-bugteam-wl5154 timestamp: Thu 2010-01-21 09:10:05 +0100 message: WL#5154 Remove deprecated 4.1 features Several items said to be deprecated in the 4.1 manual have never been removed. This worklog adds deprecation warnings when these items are used, and warns the user that the items will be removed in MySQL 5.6. A couple of previously deprecation decision have been reversed (see single file comments) ------------------------------------------------------------ revno: 2661.490.48 committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: mysql-5.1-bugteam timestamp: Wed 2010-01-20 22:22:20 -0200 message: Apply patch on behalf of Magnus: 3325 Magnus Blåudd 2010-01-05 Bug #49860 new compiler warning ha_archive - fix compiler warning by casting to ulong ------------------------------------------------------------ revno: 2661.490.47 committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: mysql-5.1-bugteam timestamp: Wed 2010-01-20 22:21:18 -0200 message: Apply patch on behalf of the NDB team: 3321 Magnus Blåudd 2010-01-05 BUG#44840 - ndbapi compiler warning - type qualifier ignored for function return type - Remove the "const" - NOTE! This is an ABI incompatible change for some C++ compilers, NdbApi applications using any of the four changed functions may need a recompile if it's using dynamic linking. ------------------------------------------------------------ revno: 2661.490.46 committer: Alfranio Correia <alfranio.correia@sun.com> branch nick: mysql-5.1-bugteam timestamp: Wed 2010-01-20 19:08:16 +0000 message: BUG#46364 MyISAM transbuffer problems (NTM problem) It is well-known that due to concurrency issues, a slave can become inconsistent when a transaction contains updates to both transaction and non-transactional tables in statement and mixed modes. In a nutshell, the current code-base tries to preserve causality among the statements by writing non-transactional statements to the txn-cache which is flushed upon commit. However, modifications done to non-transactional tables on behalf of a transaction become immediately visible to other connections but may not immediately get into the binary log and therefore consistency may be broken. In general, it is impossible to automatically detect causality/dependency among statements by just analyzing the statements sent to the server. This happen because dependency may be hidden in the application code and it is necessary to know a priori all the statements processed in the context of a transaction such as in a procedure. Moreover, even for the few cases that we could automatically address in the server, the computation effort required could make the approach infeasible. So, in this patch we introduce the option - "--binlog-direct-non-transactional-updates" that can be used to bypass the current behavior in order to write directly to binary log statements that change non-transactional tables. ------------------------------------------------------------ revno: 2661.490.45 committer: Mattias Jonsson <mattias.jonsson@sun.com> branch nick: topush-51-bugteam timestamp: Tue 2010-01-19 17:02:51 +0100 message: post-push patch for bug#47343. Missing ha_rnd_end in copy_partitions, found due to a DBUG_ASSERT in mysql-pe ------------------------------------------------------------ revno: 2661.490.44 committer: Georgi Kodinov <joro@sun.com> branch nick: B49512-5.1-bugteam timestamp: Wed 2009-12-23 17:11:22 +0200 message: Bug #49512 : subquery with aggregate function crash subselect_single_select_engine::exec() When a subquery doesn't need to be evaluated because it returns only aggregate functions and these aggregates can be calculated from the metadata about the table it was not updating all the relevant members of the JOIN structure to reflect that this is a constant query. This caused problems to the enclosing subquery ('<> SOME' in the test case above) trying to read some data about the tables. Fixed by setting const_tables to the number of tables when the SELECT is optimized away. ------------------------------------------------------------ revno: 2661.490.43 committer: Georgi Kodinov <joro@sun.com> branch nick: B45989-5.1-bugteam timestamp: Tue 2010-01-19 14:48:41 +0200 message: revert of the fix for bug #45989: pushed by mistake. ------------------------------------------------------------ revno: 2661.490.42 committer: Mattias Jonsson <mattias.jonsson@sun.com> branch nick: topush-51-bugteam timestamp: Tue 2010-01-19 12:18:48 +0100 message: merge ------------------------------------------------------------ revno: 2661.503.1 committer: Mattias Jonsson <mattias.jonsson@sun.com> branch nick: b47343-51-bt timestamp: Mon 2010-01-18 17:49:18 +0100 message: Bug#47343: InnoDB fails to clean-up after lock wait timeout on REORGANIZE PARTITION There were several problems which lead to this this, all related to bad error handling. 1) There was several bugs preventing the ddl-log to be used for cleaning up created files on error. 2) The error handling after the copy partition rows did not close and unlock the tables, resulting in deletion of partitions which were in use, which lead InnoDB to put the partition to drop in a background queue. ------------------------------------------------------------ revno: 2661.490.41 committer: Georgi Kodinov <joro@sun.com> branch nick: B45989-5.1-bugteam timestamp: Tue 2010-01-19 12:45:34 +0200 message: merge ------------------------------------------------------------ revno: 2661.502.1 committer: Sergey Glukhov <Sergey.Glukhov@sun.com> branch nick: mysql-5.1-bugteam timestamp: Tue 2010-01-19 13:03:40 +0400 message: Bug#49501 Inefficient information_schema check (system collation) added check_length optimization for I_S_NAME comparison ------------------------------------------------------------ revno: 2661.490.40 committer: Georgi Kodinov <joro@sun.com> branch nick: B45989-5.1-bugteam timestamp: Mon 2010-01-18 17:50:46 +0200 message: Bug #45989 take 2 : memory leak after explain encounters an error in the query. Fixes a leak after materializing a GROUP BY subquery to a temp table when the subquery has a blob column in the SELECT list. Fixed by correctly destructing temporary buffers after doing the conversion. ------------------------------------------------------------ revno: 2661.490.39 committer: Luis Soares <luis.soares@sun.com> branch nick: mysql-5.1-bugteam timestamp: Tue 2010-01-19 00:10:00 +0000 message: Fix for BUG#49481 and BUG#49482 reverted. PB2 run uncovered issue that needs further analysis. ------------------------------------------------------------ revno: 2661.490.38 committer: Mattias Jonsson <mattias.jonsson@sun.com> branch nick: topush-51-bugteam timestamp: Sun 2010-01-17 22:00:37 +0100 message: merge ------------------------------------------------------------ revno: 2661.494.4 committer: Mattias Jonsson <mattias.jonsson@sun.com> branch nick: b49742-51-bugteam timestamp: Tue 2009-12-22 18:59:37 +0100 message: Bug#49742: Partition Pruning not working correctly for RANGE Problem was when calculating the range of partitions for pruning. Solution was to get the calculation correct. I also simplified it a bit for easier understanding. ------------------------------------------------------------ revno: 2661.490.37 committer: <Li-Bing.Song@sun.com> branch nick: mysql-5.1-bugteam timestamp: Sat 2010-01-16 15:44:24 +0800 message: BUG#47418 RBR fails, failure with mixup of base/temporary/view 'CREATE TABLE IF NOT EXISTS ... SELECT' statement were causing 'CREATE TEMPORARY TABLE ...' to be written to the binary log in row-based mode (a.k.a. RBR), when there was a temporary table with the same name. Because the 'CREATE TABLE ... SELECT' statement was executed as 'INSERT ... SELECT' into the temporary table. Since in RBR mode no other statements related to temporary tables are written into binary log, this sometimes broke replication. This patch changes behavior of 'CREATE TABLE [IF NOT EXISTS] ... SELECT ...'. it ignores existence of temporary table with the same name as table being created and is interpreted as attempt to create/insert into base table. This makes behavior of 'CREATE TABLE [IF NOT EXISTS] ... SELECT' consistent with how ordinary 'CREATE TABLE' and 'CREATE TABLE ... LIKE' behave. ------------------------------------------------------------ revno: 2661.490.36 committer: Georgi Kodinov <joro@sun.com> branch nick: B46175-5.1-bugteam timestamp: Fri 2010-01-15 16:09:20 +0200 message: Bug #46175: NULL read_view and consistent read assertion The optimizer must not continue executing the current query if e.g. the storage engine reports an error. This is somewhat hard to implement with Item::val_xxx() because they do not have means to return error code. This is why we need to check the thread's error state after a call to one of the Item::val_xxx() methods. Fixed store_key_item::copy_inner() to return an error state if an error happened during the call to Item::save_in_field() because it calls Item::val_xxx(). Also added similar checks to related places. ------------------------------------------------------------ revno: 2959 committer: Alfranio Correia <alfranio.correia@sun.com> branch nick: mysql-trunk-merge timestamp: Thu 2010-01-21 14:16:12 +0000 message: BUG#50397 rpl.rpl_heartbeat_basic fails in mysql-trunk-merge Resetting the master before stopping the slave was generating the message "[ERROR] Slave I/O: Got fatal error 1236 from master when reading data from binary log: 'could not find next log', Error_code: 1236". In consequence, the test case was failing because the message had not been suppressed. To circumvent the failure, we rewrote the test stopping the slave before resetting the master. We prefer this alternative rather than suppressing the message. ------------------------------------------------------------ revno: 2958 committer: Alexander Nozdrin <alik@sun.com> branch nick: mysql-trunk-merge timestamp: Mon 2010-01-18 23:15:17 +0300 message: Manual merge from mysql-trunk. Conflicts: - support-files/mysql.spec.sh ------------------------------------------------------------ revno: 2875.34.8 committer: MySQL Build Team <build@mysql.com> branch nick: mysql-5.5 timestamp: Fri 2010-01-15 01:10:40 +0100 message: Automerge the 5.5.1-m2 release back into the main branch. ------------------------------------------------------------ revno: 2875.36.7 tags: mysql-5.5.1-m2 committer: Joerg Bruehe <joerg@mysql.com> branch nick: clone-5.5 timestamp: Mon 2010-01-04 15:03:09 +0100 message: Ensure that the variable "MYSQL_U_SCORE_VERSION" is expanded whereever it is used (currently, only RPM spec files). |