|
------------------------------------------------------------
revno: 3184 [merge] tags: clone-5.5.12-build committer: Alexander Nozdrin <alexander.nozdrin@oracle.com> branch nick: mysql-5.5-security timestamp: Fri 2011-04-08 18:07:59 +0400 message: Auto-merge from mysql-5.5. ------------------------------------------------------------ revno: 3097.55.74 committer: Alexander Barkov <alexander.barkov@oracle.com> branch nick: mysql-5.5.b60625v2 timestamp: Fri 2011-04-08 17:15:23 +0400 message: Bug#11926811 / Bug#60625 Illegal mix of collations Problem: comparison of a DATETIME sp variable and NOW() led to Illegal mix of collations error when character_set_connection=utf8. Introduced by "WL#2649 Number-to-string conversions". Error happened in Arg_comparator::set_compare_func(), because the first argument was errouneously converted to utf8, while the second argument was not. Fix: separate agg_arg_charsets_for_comparison() into two functions: - agg_arg_charsets_for_comparison() - for pure comparison, when we don't need to return any string result and therefore don't need to convert arguments to @@character_set_connection: SELECT a = b; - agg_arg_charsets_for_string_results_with_comparison() - when we need to return a string result, but we also need to do comparison internally: SELECT REPLACE(a,b,c) If all arguments are numbers: SELECT REPLACE(123,2,3) -> 133 we convert arguments to @@character_set_connection. @ mysql-test/include/ctype_numconv.inc @ mysql-test/r/ctype_binary.result @ mysql-test/r/ctype_cp1251.result @ mysql-test/r/ctype_latin1.result @ mysql-test/r/ctype_ucs.result @ mysql-test/r/ctype_utf8.result Adding tests @ sql/item.cc @ sql/item.h @ sql/item_func.cc @ sql/item_func.h @ sql/item_strfunc.cc Introducing and using new function agg_item_charsets_for_string_result_with_comparison() and its Item_func wrapper agg_arg_charsets_for_string_result_with_comparison(). ------------------------------------------------------------ revno: 3183 [merge] committer: Alexander Nozdrin <alexander.nozdrin@oracle.com> branch nick: mysql-5.5-security timestamp: Fri 2011-04-08 14:51:54 +0400 message: Empty merge from mysql-5.1-security. ------------------------------------------------------------ revno: 2661.758.6 [merge] committer: Alexander Nozdrin <alexander.nozdrin@oracle.com> branch nick: mysql-5.1-security timestamp: Fri 2011-04-08 14:49:41 +0400 message: Auto-merge from mysql-5.1. ------------------------------------------------------------ revno: 3182 [merge] committer: Alexander Nozdrin <alexander.nozdrin@oracle.com> branch nick: mysql-5.5-security timestamp: Fri 2011-04-08 14:49:52 +0400 message: Auto-merge from mysql-5.5. ------------------------------------------------------------ revno: 3097.55.73 committer: Alexander Nozdrin <alexander.nozdrin@oracle.com> branch nick: mysql-5.5-bug12325375 timestamp: Fri 2011-04-08 14:23:36 +0400 message: A patch for Bug#12325375: THE SERVER ON WINXP DOES NOT ALLOW CONNECTIONS IF NO DNS-SERVER AVAILABLE. The thing is that on Windows XP getnameinfo() returns WSANO_DATA when hostname-lookup is not available. The problem was that this error code was treated as serious error and the client connection got rejected. The fix is to treat all errors from getnameinfo() as not ciritical, but add IP-address to the host cache only for EAI_NONAME (or WSANO_DATA). ------------------------------------------------------------ revno: 3097.55.72 [merge] committer: Gleb Shchepa <gleb.shchepa@oracle.com> branch nick: mysql-5.5 timestamp: Fri 2011-04-08 12:09:24 +0400 message: manual merge 5.1-->5.5 (bug 11829681) ------------------------------------------------------------ revno: 2661.754.23 committer: Gleb Shchepa <gleb.shchepa@oracle.com> branch nick: bug11829681-5.1 timestamp: Fri 2011-04-08 12:05:20 +0400 message: Bug #11829681 - 60295: ERROR 1356 ON VIEW THAT EXECUTES FINE AS A QUERY Select from a view with the underlying HAVING clause failed with a message: "1356: View '...' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them" The bug is a regression of the fix for bug 11750328 - 40825 (similar case, but the HAVING cause references an aliased field). In the old fix for bug 40825 the Item_field::name_length value has been used in place of the real length of Item_field::name. However, in some cases Item_field::name_length is not in sync with the actual name length (TODO: combine name and name_length into a solid String field). The Item_ref::print() method has been modified to calculate actual name length every time. ------------------------------------------------------------ revno: 3097.55.71 committer: Nirbhay Choubey <nirbhay.choubey@oracle.com> branch nick: mysql-5.5 timestamp: Fri 2011-04-08 12:34:54 +0530 message: Adjusting test result for bug#11765157. ------------------------------------------------------------ revno: 3097.55.70 [merge] committer: Nirbhay Choubey <nirbhay.choubey@oracle.com> branch nick: mysql-5.5 timestamp: Fri 2011-04-08 12:25:59 +0530 message: Merging patch for bug#11765157 from mysql-5.1. ------------------------------------------------------------ revno: 2661.754.22 committer: Nirbhay Choubey <nirbhay.choubey@oracle.com> branch nick: mysql-5.1.58090 timestamp: Fri 2011-04-08 12:22:44 +0530 message: Bug#11765157 - 58090: mysqlslap drops schema specified in create_schema if auto-generate-sql also set. mysqlslap uses a schema to run its tests on and later drops it if auto-generate-sql is used. This can be a problem, if the schema is an already existing one. If create-schema is used with auto-generate-sql option, mysqlslap while performing the cleanup, drops the specified database. Fixed by introducing an option --no-drop, which, if used, will prevent the dropping of schema at the end of the test. ------------------------------------------------------------ revno: 3097.55.69 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: main-55 timestamp: Thu 2011-04-07 13:43:03 +0200 message: null upmerge ------------------------------------------------------------ revno: 2661.754.21 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: merge-51 timestamp: Thu 2011-04-07 13:15:24 +0200 message: merge from 5.1-mtr ------------------------------------------------------------ revno: 3097.55.68 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: main-55 timestamp: Thu 2011-04-07 13:42:00 +0200 message: merge from 5.5-mtr ------------------------------------------------------------ revno: 3077.6.113 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: mtr-55 timestamp: Thu 2011-04-07 12:36:01 +0200 message: merge from 5.5 main ------------------------------------------------------------ revno: 3077.6.112 committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: dbx-55 timestamp: Thu 2011-04-07 10:12:52 +0200 message: Bug #12316050 MTR: --REPORT-TIMES GIVES TOO HIGH NUMBER FOR INITIALIZATION Forgot that the main thread would be idle while waiting for tests Added sub mark_time_idle() so ignore time spent waiting Also added a new time category 'admin' to take some of 'init' ------------------------------------------------------------ revno: 3077.6.111 committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: dbx-55 timestamp: Thu 2011-04-07 10:10:57 +0200 message: Bug #11760361 52764: EXTEND MYSQL-TEST-RUN SUPPORT FOR SUN STUDIO DBX BY ADDING --DBX DEBUGGER Added necessary options and variables Added dbx_arguments() similar to gdb_arguments() Unlike gdb, cannot use init file but must provide commands and args as command line argument to dbx Also simplified debugger behavior to always start with a breakpoint in main() ------------------------------------------------------------ revno: 3077.6.110 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: mtr-55 timestamp: Tue 2011-04-05 15:26:17 +0200 message: null upmerge ------------------------------------------------------------ revno: 2661.717.43 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: merge-51 timestamp: Tue 2011-04-05 15:02:01 +0200 message: merge from 5.1 main ------------------------------------------------------------ revno: 3077.6.109 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: mtr-55 timestamp: Tue 2011-04-05 15:04:05 +0200 message: merge from 5.5 main ------------------------------------------------------------ revno: 3077.6.108 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: mtr-55 timestamp: Thu 2011-03-31 15:50:29 +0200 message: null-merge ------------------------------------------------------------ revno: 2661.717.42 committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: supp-51 timestamp: Thu 2011-03-31 15:48:05 +0200 message: One more test suppression for rpl_extra_col_master tests ------------------------------------------------------------ revno: 3077.6.107 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: mtr-55 timestamp: Thu 2011-03-31 12:10:40 +0200 message: null upmerge ------------------------------------------------------------ revno: 2661.717.41 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: supp-51 timestamp: Thu 2011-03-31 11:22:54 +0200 message: merge from 5.1 main ------------------------------------------------------------ revno: 3077.6.106 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: mtr-55 timestamp: Thu 2011-03-31 12:09:03 +0200 message: merge from 5.5 main ------------------------------------------------------------ revno: 3077.6.105 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: mtr-55 timestamp: Thu 2011-03-31 10:37:15 +0200 message: Small followup fix after MTR warning cleanup ------------------------------------------------------------ revno: 2661.717.40 committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: supp-51 timestamp: Thu 2011-03-31 10:33:07 +0200 message: Small followup fix after MTR warning cleanup ------------------------------------------------------------ revno: 3077.6.104 [merge] committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: mtr-55 timestamp: Wed 2011-03-30 14:55:53 +0200 message: mtr: cleaned up some superfluos global warning suppressions ------------------------------------------------------------ revno: 2661.717.39 committer: Bjorn Munch <bjorn.munch@oracle.com> branch nick: supp-51 timestamp: Wed 2011-03-30 14:33:53 +0200 message: mtr: cleaned up some superfluos global warning suppressions ------------------------------------------------------------ revno: 3181 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.5-security timestamp: Thu 2011-04-07 15:11:51 +0300 message: fixed a number for a missing warning ------------------------------------------------------------ revno: 2661.758.5 committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.1-security timestamp: Thu 2011-04-07 14:44:26 +0300 message: fixed a missing warning ------------------------------------------------------------ revno: 3180 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.5-security timestamp: Thu 2011-04-07 13:57:32 +0300 message: merge mysql-5.1-security->mysql-5.5-security ------------------------------------------------------------ revno: 2661.758.4 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.1-security timestamp: Thu 2011-04-07 12:31:25 +0300 message: merge mysql-5.0-security->mysql-5.1-security ------------------------------------------------------------ revno: 1810.4000.13 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.0-security timestamp: Thu 2011-04-07 12:17:36 +0300 message: merge mysql-5.0->mysql-5.0-security ------------------------------------------------------------ revno: 2661.758.3 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.1-security timestamp: Thu 2011-04-07 12:24:10 +0300 message: merged mysql-5.1->mysql-5.1-security ------------------------------------------------------------ revno: 2661.758.2 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.1-security timestamp: Mon 2011-03-21 16:03:35 +0200 message: merge mysql-5.0-security->mysql-5.1-security ------------------------------------------------------------ revno: 1810.4000.12 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.0-security timestamp: Mon 2011-03-21 15:54:17 +0200 message: merge ------------------------------------------------------------ revno: 1810.4003.1 committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: kent-5.0 timestamp: Tue 2011-02-08 17:36:25 +0200 message: Bug #59815: Missing License information with enterprise GPL packages on behalf of Kent: Include the README into the binary packages ------------------------------------------------------------ revno: 1810.4000.11 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.0-security timestamp: Mon 2011-03-21 15:52:45 +0200 message: merge 5.0->5.0-security ------------------------------------------------------------ revno: 2661.758.1 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.1-security timestamp: Mon 2011-03-21 16:01:40 +0200 message: merge mysql-5.1->mysql-5.1-security ------------------------------------------------------------ revno: 3179 [merge] committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: merge-5.5-security timestamp: Thu 2011-04-07 12:59:51 +0300 message: merge 5.5->5.5-security ------------------------------------------------------------ revno: 3097.55.67 committer: Jon Olav Hauglid <jon.hauglid@oracle.com> branch nick: mysql-5.5-test timestamp: Thu 2011-04-07 11:41:20 +0200 message: BUG#11815600 - [ERROR] INNODB COULD NOT FIND INDEX PRIMARY KEY NO 0 FOR TABLE IN ERROR LOG Post merge fix, update the .result file. ------------------------------------------------------------ revno: 3097.55.66 [merge] committer: Sunanda Menon <sunanda.menon@oracle.com> branch nick: mysql-5.5 timestamp: Thu 2011-04-07 08:59:07 +0200 message: Merge from mysql-5.5.11-release ------------------------------------------------------------ revno: 3097.68.3 tags: mysql-5.5.11 committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com> branch nick: mysql-5.5.11-release timestamp: Thu 2011-03-31 16:08:31 +0300 message: Merged the fix for bug #11936829 to 5.5.11 release Bug #11936829: DIFF. BETWEEN MYSQL.USER (AUTHENTICATION_STRING) IN FRESH AND UPGRADED 5.5.11 There was no modification for pre 5.5.11 builds that had authentication_string. Thus the column was not upgraded by mysql_upgrade. Fixed by adding an ALTER TABLE MODIFY to update an existing column to the latest type version. Test suite added. |