1. 12 Oct, 2007 2 commits
  2. 11 Oct, 2007 3 commits
    • 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
  3. 10 Oct, 2007 7 commits
    • 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
  4. 09 Oct, 2007 11 commits
  5. 08 Oct, 2007 2 commits
    • unknown's avatar
      Fixed bug #31310. · b9805a5a
      unknown authored
      Locked rows of the InnoDB storage was silently skipped in the read-committed
      isolation level.
      
      QUICK_RANGE_SELECT for unique ranges lacks second (blocking) read
      of the record that was read semi-consistently and just skip it.
      
      The handler::read_multi_range_next method has been modified
      to retry previous unique range if the previous read was
      semi-consistent.
      
      
      sql/handler.cc:
        Fixed bug #31310.
        The handler::read_multi_range_next method has been modified
        to retry previous unique range if the previous read was
        semi-consistent.
      mysql-test/include/mix1.inc:
        Added test case for bug #31310.
      mysql-test/r/innodb_mysql.result:
        Added test case for bug #31310.
      b9805a5a
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 3867aed6
      unknown authored
      into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
      
      
      3867aed6
  6. 06 Oct, 2007 1 commit
  7. 05 Oct, 2007 14 commits