- 25 Oct, 2007 1 commit
-
-
unknown authored
doesn't recognize it This is a 5.1 version of the patch. Problem: 'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up in SHOW VARIABLES, but could not be used in expressions like "select @@log". Also, using them in the SET statement produced an incorrect "unknown system variable" error. Solution: Since as of MySQL 5.1.12 one can enable or disable the general query log or the slow query log at runtime by changing values of general_log/slow_query_log, make 'log' and 'log_slow_queries" to be synonyms for 'general_log' and 'slow_query_log' respectively. This makes expressions using the '@@var' syntax backward compatible with 5.0 and SHOW VARIABLES output to be consistent with the SET statement. mysql-test/r/log_state.result: Added a test case for bug #29131. mysql-test/t/log_state.test: Added a test case for bug #29131. sql/set_var.cc: Made the 'log' and 'log_slow_queries' system variables to be synonyms for 'general_log' and 'slow_query_log'.
-
- 21 Oct, 2007 2 commits
-
-
unknown authored
into polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550 mysql-test/t/func_str.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_strfunc.h: Auto merged mysql-test/r/func_str.result: Manual merge.
-
unknown authored
Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account. This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args(). mysql-test/r/func_str.result: Import patch bug288550.patch mysql-test/t/func_str.test: Import patch bug288550.patch sql/item.cc: Import patch bug288550.patch sql/item.h: Import patch bug288550.patch sql/item_strfunc.h: Import patch bug288550.patch
-
- 17 Oct, 2007 3 commits
-
-
unknown authored
move 'table_collation' field filling outside of if(file) condition because this field has 'OPEN_FRM_ONLY' attribute mysql-test/r/information_schema.result: test result mysql-test/t/information_schema.test: test case sql/sql_show.cc: move 'table_collation' field filling outside of if(file) condition because this field has 'OPEN_FRM_ONLY' attribute
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/suite/funcs_1/r/innodb__datadict.result: manual merge mysql-test/suite/funcs_1/r/myisam__datadict.result: manual merge
-
unknown authored
updated result files mysql-test/suite/funcs_1/r/innodb__datadict.result: updated result file mysql-test/suite/funcs_1/r/memory__datadict.result: updated result file mysql-test/suite/funcs_1/r/myisam__datadict.result: updated result file
-
- 16 Oct, 2007 2 commits
-
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt sql/item.cc: Auto merged sql/item.h: manual merge
-
- 15 Oct, 2007 3 commits
-
-
unknown authored
issue an error if string has illegal characters mysql-test/r/ctype_utf8.result: issue an error if string has illegal characters mysql-test/t/ctype_utf8.test: issue an error if string has illegal characters sql/item.cc: issue an error if string has illegal characters sql/item.h: issue an error if string has illegal characters sql/sql_yacc.yy: issue an error if string has illegal characters
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/type_decimal.result: Auto merged strings/decimal.c: Auto merged
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.0-opt
-
- 14 Oct, 2007 2 commits
- 13 Oct, 2007 4 commits
-
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/B31156-5.1-opt mysql-test/r/func_group.result: Auto merged mysql-test/t/func_group.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_sum.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.1-opt sql/item_cmpfunc.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt sql/item_cmpfunc.cc: Auto merged
-
- 12 Oct, 2007 8 commits
-
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.1-opt
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.0-opt
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/B31440-5.1-opt mysql-test/r/func_regexp.result: Auto merged sql/item_cmpfunc.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
-
unknown authored
into mysql.com:/home/hf/work/31155/my51-31155 sql/item.cc: Auto merged sql/item.h: Auto merged
-
unknown authored
into mysql.com:/home/hf/work/31155/my51-31155 sql/item.cc: Auto merged sql/item.h: merging
-
unknown authored
into mysql.com:/home/hf/work/31155/my50-31155 sql/item.cc: Auto merged
-
unknown authored
into mysql.com:/home/hf/work/31155/my51-31155 sql/item.h: Auto merged sql/item_geofunc.h: Auto merged sql/item.cc: merging sql/item_geofunc.cc: merging
-
- 11 Oct, 2007 6 commits
-
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/create.result: Auto merged mysql-test/r/null.result: Auto merged sql/item_cmpfunc.cc: Auto merged
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.0-opt
-
unknown authored
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/sql_yacc.yy: manual merge
-
unknown authored
Bug#30982 CHAR(..USING..) can return a not-well-formed string Bug#30986 Character set introducer followed by a HEX string can return bad result check_well_formed_result moved to Item from Item_str_func fixed Item_func_char::val_str for proper ucs symbols converting added check for well formed strings for correct conversion of constants with underscore charset mysql-test/r/ctype_ucs.result: test result mysql-test/r/ctype_utf8.result: test result mysql-test/t/ctype_ucs.test: test case mysql-test/t/ctype_utf8.test: test case sql/item.cc: check_well_formed_result() moved from Item_str_func sql/item.h: check_well_formed_result() moved from Item_str_func sql/item_strfunc.cc: check_well_formed_result moved to Item fixed Item_func_char::val_str for proper ucs symbols converting sql/item_strfunc.h: check_well_formed_result moved to Item sql/sql_yacc.yy: added check for well formed string
-
unknown authored
The special case with NULL as a regular expression was handled at prepare time. But in this special case the item was not marked as fixed. This caused an assertion at execution time. Fixed my marking the item as fixed even when known to return NULL at prepare time. mysql-test/r/func_regexp.result: Bug #31440: test case mysql-test/t/func_regexp.test: Bug #31440: test case sql/item_cmpfunc.cc: Bug #31440: mark the item as fixed even when known to return NULL.
-
- 10 Oct, 2007 8 commits
-
-
unknown authored
precision > 0 && scale <= precision'. A sign of a resulting item of the IFNULL function was not updated and the maximal length of this result was calculated improperly. Correct algorithm was copy&pasted from the IF function implementation. sql/item_cmpfunc.cc: Fixed bug #31471. The Item_func_ifnull::fix_length_and_dec method has been modified to update the Item_func_ifnull::unsigned_flag field and to take this field into account when calculating the Item_func_ifnull::max_length value. (See Item_func_if::fix_length_and_dec for reference). mysql-test/t/null.test: Added test case for bug #31471. mysql-test/r/null.result: Added test case for bug #31471. mysql-test/r/create.result: Update test case after the bugfix of bug #31471.
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt libmysql/libmysql.c: Auto merged
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt libmysql/libmysql.c: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/innodb_mysql.result: Auto merged sql/field.cc: Auto merged sql/ha_partition.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt libmysql/libmysql.c: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt sql/item_timefunc.h: Auto merged mysql-test/suite/rpl/r/rpl_flushlog_loop.result: Auto merged sql/set_var.cc: manual merge. mysql-test/r/view.result: manual merge mysql-test/suite/rpl/t/rpl_flushlog_loop.test: manual merge mysql-test/t/view.test: manual merge
-
unknown authored
added variables relay_log, relay_log_index, relay_log_info_file to init_vars[] to make them visible within SHOW VARIABLES mysql-test/r/rpl_flush_log_loop.result: test result mysql-test/t/rpl_flush_log_loop.test: test case sql/set_var.cc: added variables relay_log, relay_log_index, relay_log_info_file to init_vars[] to make them visible within SHOW VARIABLES
-
unknown authored
removed now() call to make the test to be year independent mysql-test/r/view.result: result fix mysql-test/t/view.test: removed now() call to make the test to be year independent
-
- 09 Oct, 2007 1 commit
-
-
unknown authored
into dl145s.mysql.com:/data0/mhansson/bug31160/my51-bug31160 sql/item_timefunc.h: Auto merged
-