1. 04 Apr, 2007 1 commit
    • unknown's avatar
      Bug #27638: slow logging to CSV table inserts bad query_time and lock_time values · 82e10767
      unknown authored
      When MySQL logged slow query information to a CSV table, it stored the
      query_time and lock_time values with an incorrect formula.
      
      If the time was over 59 seconds, this caused incorrect statistics (either the
      slow query was not logged, or the time was far from correct).  This change
      fixes the method used to store those TIME values in the slow_log table.
      
      
      mysql-test/r/log_tables-big.result:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/r/log_tables-big.result
      mysql-test/t/log_tables-big-master.opt:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/log_tables-big-master.opt
      mysql-test/t/log_tables-big.test:
        BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/log_tables-big.test
      sql/time.cc:
        initialize all TIME fields (except neg, which may store a
        needed value) in calc_time_from_sec()
      sql/log.cc:
        Log_to_csv_event_handler::log_slow(): call store_time() instead of store() for query_time and lock_time
      include/my_time.h:
        Add TIME_MAX_VALUE_SECONDS definition
      82e10767
  2. 03 Apr, 2007 6 commits
  3. 02 Apr, 2007 11 commits
    • unknown's avatar
      Merge recycle.(none):/src/bug23491_ii/my50-bug23491_ii · a785f39a
      unknown authored
      into  recycle.(none):/src/bug23491_ii/my51-bug23491_ii
      
      
      mysql-test/t/mysqldump.test:
        Auto merged
      a785f39a
    • unknown's avatar
      Minor test cleanup. · d97bf9f1
      unknown authored
      
      mysql-test/t/mysqldump.test:
        Fix for failing Windows test.
      d97bf9f1
    • unknown's avatar
      After merge fix · 9ae27b72
      unknown authored
      9ae27b72
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 · 26c749b2
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      client/client_priv.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/rpl_deadlock_innodb.result:
        Auto merged
      mysql-test/r/rpl_flushlog_loop.result:
        Auto merged
      mysql-test/r/rpl_known_bugs_detection.result:
        Auto merged
      mysql-test/r/rpl_ndb_basic.result:
        Auto merged
      mysql-test/r/rpl_ndb_extraCol.result:
        Auto merged
      mysql-test/r/rpl_ndb_sync.result:
        Auto merged
      mysql-test/r/rpl_rbr_to_sbr.result:
        Auto merged
      mysql-test/r/rpl_row_inexist_tbl.result:
        Auto merged
      mysql-test/r/rpl_row_max_relay_size.result:
        Auto merged
      mysql-test/r/rpl_row_tabledefs_2myisam.result:
        Auto merged
      mysql-test/r/rpl_row_tabledefs_3innodb.result:
        Auto merged
      mysql-test/r/rpl_stm_max_relay_size.result:
        Auto merged
      mysql-test/r/rpl_stm_until.result:
        Auto merged
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/gis.result:
        Merge 5.0->5.1
      mysql-test/r/rpl_000015.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_change_master.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_loaddata.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_log_pos.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_ndb_log.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_rotate_logs.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_row_log.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_row_log_innodb.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_row_reset_slave.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_row_until.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_server_id1.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_server_id2.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_log.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/r/rpl_stm_reset_slave.result:
        Merge after adding new column to SHOW SLAVE STATUS
      mysql-test/t/gis.test:
        Merge 5.0->5.1
      26c749b2
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 20fd84c0
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      mysql-test/t/create.test:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisam/mi_open.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Manual merge
      mysql-test/r/create.result:
        Manual merge of revert
      20fd84c0
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · a840a684
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      myisam/mi_open.c:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/create.result:
        SCCS merged
      mysql-test/t/create.test:
        SCCS merged
      a840a684
    • unknown's avatar
      Cset exclude: tsmith@siva.hindu.god|ChangeSet|20070328212513|13373 · c291f6b9
      unknown authored
      
      myisam/mi_open.c:
        Exclude
      mysql-test/r/create.result:
        Exclude
      mysql-test/t/create.test:
        Exclude
      sql/table.cc:
        Exclude
      c291f6b9
    • unknown's avatar
      Fix spelling error · 79ccea76
      unknown authored
      79ccea76
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · ca418483
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
      
      
      mysql-test/mysql-test-run.pl:
        Manual merge 5.0->5.1
      ca418483
    • unknown's avatar
      Bug#27049 Race condition in test mysqlbinlog.test · f4b40dae
      unknown authored
      Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases
      to decide what params to use.
      
      
      mysql-test/mysql-test-run.pl:
        Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases
        to decide what params to use.
      f4b40dae
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 93381fb4
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      93381fb4
  4. 01 Apr, 2007 1 commit
  5. 31 Mar, 2007 19 commits
  6. 30 Mar, 2007 2 commits