1. 10 Apr, 2007 11 commits
  2. 09 Apr, 2007 5 commits
  3. 08 Apr, 2007 2 commits
  4. 07 Apr, 2007 11 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · be15f0c8
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
      
      
      sql/sql_load.cc:
        Auto merged
      be15f0c8
    • unknown's avatar
      merging fix · 69a083ce
      unknown authored
      
      mysql-test/r/windows.result:
        result fixed
      69a083ce
    • unknown's avatar
      after-merging fix · 183200ab
      unknown authored
      
      mysql-test/r/events_trans.result:
        result fixed
      mysql-test/r/windows.result:
        merging fix
      mysql-test/t/events_trans.test:
        moved to events_trans_notembedded.test
      mysql-test/r/events_trans_notembedded.result:
        New BitKeeper file ``mysql-test/r/events_trans_notembedded.result''
      mysql-test/t/events_trans_notembedded.test:
        New BitKeeper file ``mysql-test/t/events_trans_notembedded.test''
      183200ab
    • unknown's avatar
      Merge mysql.com:/home/hf/work/26074/my51-26074 · 746ffa83
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      746ffa83
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 371c29dd
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      sql/field.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      371c29dd
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · c5d7cab5
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/rpl_packet.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/rpl_packet.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      mysql-test/r/create.result:
        SCCS merged
      mysql-test/t/create.test:
        merging
      mysql-test/t/disabled.def:
        merging
      sql/events.cc:
        merging
      sql/sql_parse.cc:
        SCCS merged
      c5d7cab5
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 81e04f88
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
      
      81e04f88
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · f34207f4
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      f34207f4
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · fc19d8eb
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      sql/field.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      fc19d8eb
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 834e8228
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
      
      834e8228
    • unknown's avatar
      test temporarily disabled · fcf5bee9
      unknown authored
      fcf5bee9
  5. 06 Apr, 2007 11 commits
    • unknown's avatar
      disabled test and feature · 5238c1be
      unknown authored
      5238c1be
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e7283b6b
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
      
      e7283b6b
    • unknown's avatar
      Bug#27586: Wrong autoinc value assigned by LOAD DATA in the · 398b21a3
      unknown authored
      NO_AUTO_VALUE_ON_ZERO mode.
      
      The table->auto_increment_field_not_null variable wasn't reset after
      reading a row which may lead to inserting a wrong value to the auto-increment
      field to the following row.
      
      The table->auto_increment_field_not_null variable is reset now right after a
      row is being written in the read_fixed_length() and the read_sep_field()
      functions.
      Removed wrong setting of the table->auto_increment_field_not_null variable in
      the read_sep_field() function.
      
      
      mysql-test/t/loaddata.test:
        Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
        NO_AUTO_VALUE_ON_ZERO mode.
      mysql-test/r/loaddata.result:
        Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
        NO_AUTO_VALUE_ON_ZERO mode.
      sql/sql_load.cc:
        Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
        NO_AUTO_VALUE_ON_ZERO mode.
        The table->auto_increment_field_not_null variable is reset now right after a
        row is being written in the read_fixed_length() and the read_sep_field()
        functions.
        Remove wrong setting of the table->auto_increment_field_not_null variable in
        the read_sep_field() function.
      398b21a3
    • unknown's avatar
      Merge xiphis.org:/home/antony/work2/mysql-5.0-engines.merge · 8a6f10ba
      unknown authored
      into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      8a6f10ba
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · c7552953
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      c7552953
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 934275af
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      934275af
    • unknown's avatar
      Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines · c9a72fd8
      unknown authored
      into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      c9a72fd8
    • unknown's avatar
      Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · ed79c13f
      unknown authored
      into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      ed79c13f
    • unknown's avatar
      Merge vajra.(none):/opt/local/work/mysql-5.0-runtime · e845da78
      unknown authored
      into  vajra.(none):/opt/local/work/mysql-5.1-runtime
      
      
      sql/parse_file.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      e845da78
    • unknown's avatar
      Polishing: note added. · 133bf1fd
      unknown authored
      133bf1fd
    • unknown's avatar
      Remove a race between Event Scheduler shutdown and SHOW PROCESSLIST. · 0e80ac9c
      unknown authored
      This will hopefully fix events.test failure on vmware-win32, 
      where scheduling is very primitive.
      
      
      mysql-test/t/events_scheduling.test:
        This test case has no races now and can be enabled under valgrind.
      sql/event_scheduler.cc:
        Make Event Scheduler thread shutdown more synchronous: report
        successful shutdown only after having removed the scheduler
        thread from the global list of threads.
        This ensures that after the scheduler has been stopped, its
        thread is not present in SHOW PROCESSLIST output.
      0e80ac9c