1. 25 Oct, 2007 1 commit
    • unknown's avatar
      Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET · 974201c7
      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'.
      974201c7
  2. 21 Oct, 2007 2 commits
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 · e259d461
      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.
      e259d461
    • unknown's avatar
      Bug #28550 "Potential bugs related to the return type of the CHAR function". · 04311fab
      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
      04311fab
  3. 17 Oct, 2007 3 commits
    • unknown's avatar
      Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA · 666efa1c
      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
      666efa1c
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 9f75b3cf
      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
      9f75b3cf
    • unknown's avatar
      Bug#31568 Some "information_schema" entries suddenly report a NULL default · 62a7e160
      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
      62a7e160
  4. 16 Oct, 2007 2 commits
  5. 15 Oct, 2007 3 commits
  6. 14 Oct, 2007 2 commits
  7. 13 Oct, 2007 4 commits
  8. 12 Oct, 2007 8 commits
  9. 11 Oct, 2007 6 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471 · f0fcc8c2
      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
      f0fcc8c2
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31471 · 1fc06a1f
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      1fc06a1f
    • unknown's avatar
      after merge fix · 048cb42d
      unknown authored
      048cb42d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 937504e7
      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
      937504e7
    • unknown's avatar
      Bug#30981 CHAR(0x41 USING ucs2) doesn't add leading zero · f30eacb2
      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
      f30eacb2
    • unknown's avatar
      Bug #31440: 'select 1 regex null' asserts debug server · 76af5717
      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.
      76af5717
  10. 10 Oct, 2007 8 commits
    • unknown's avatar
      Fixed bug #31471: decimal_bin_size: Assertion `scale >= 0 && · c866f801
      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.
      c866f801
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · cbe03180
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      libmysql/libmysql.c:
        Auto merged
      cbe03180
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 2dd78add
      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
      2dd78add
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 6146c0c7
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      libmysql/libmysql.c:
        Auto merged
      6146c0c7
    • unknown's avatar
      after merge fix · 9676a86a
      unknown authored
      9676a86a
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 9c46621d
      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
      9c46621d
    • unknown's avatar
      Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES · 62f72d36
      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
      62f72d36
    • unknown's avatar
      Bug#25359 Test 'view' is dependent on current year to be 2006 · 15453e3a
      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
      15453e3a
  11. 09 Oct, 2007 1 commit