1. 10 Oct, 2007 3 commits
    • 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
  2. 09 Oct, 2007 11 commits
  3. 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
  4. 06 Oct, 2007 1 commit
  5. 05 Oct, 2007 20 commits
  6. 04 Oct, 2007 3 commits
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 9f4a5928
      unknown authored
      into  dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
      
      
      9f4a5928
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · f2302e55
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/func_math.test:
        Auto merged
      mysql-test/t/func_misc.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      client/client_priv.h:
        manual merge
      f2302e55
    • unknown's avatar
      after merge fix · fca5cbe6
      unknown authored
      fca5cbe6