1. 21 Feb, 2006 1 commit
    • unknown's avatar
      fix for bug#16407 (EVENTS: sql_mode) · ae48f5fd
      unknown authored
      post-review fixes
      
      
      mysql-test/r/events_bugs.result:
        fix result
      sql/event.cc:
        fix compilation problem on windows
      sql/event_executor.cc:
        show the right host in show processlist (should be event_scheduler@localhost)
      sql/event_timed.cc:
        a bit more debug infor
        fix a problem introduced with previous push :( . clean everything that's whitespace.
        found because of new test cases which were crashing.
      sql/sql_show.cc:
        fix compile problem on windows
      ae48f5fd
  2. 20 Feb, 2006 26 commits
  3. 19 Feb, 2006 8 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release · 36d40091
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      36d40091
    • unknown's avatar
      mysql-test-run.pl: · 8cab8c82
      unknown authored
        Added --restart-cleanup option
      drop-on-restart.inc:
        DROP commands to cleanup on restart
        new file
      mysqltest.c:
        Added option --include=<sql-file>
      
      
      client/mysqltest.c:
        Added option --include=<sql-file>
      mysql-test/include/drop-on-restart.inc:
        DROP commands to cleanup on restart
      mysql-test/mysql-test-run.pl:
        Added --restart-cleanup option
      8cab8c82
    • unknown's avatar
      Merge · 424ade5c
      unknown authored
      424ade5c
    • unknown's avatar
      Merge · 77d7fd80
      unknown authored
      
      client/Makefile.am:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      client/mysqlimport.c:
        SCCS merged
      77d7fd80
    • unknown's avatar
      We had a number of tests where there were no bugs related to disabling of... · bc49480d
      unknown authored
      We had a number of tests where there were no bugs related to disabling of tests, bugs were fixed, or no clear discription or plan.
      
      
      mysql-test/t/disabled.def:
        Re-enabling tests.
      bc49480d
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1c16fb14
      unknown authored
      into  zim.tangent.org:/home/brian/mysql/dep-5.1
      
      
      1c16fb14
    • unknown's avatar
      Fixed some threading issues that Guilhem found (and its what I get for copy... · 99502158
      unknown authored
      Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 
      
      
      client/Makefile.am:
        Added threaded libary.
      client/mysqlimport.c:
        Updated logic to use threaded libmysql correctly.
      client/mysqlslap.c:
        Modified how threads were working.
      mysql-test/r/backup.result:
        Added deprecated messages.
      sql/sql_yacc.yy:
        Added deprecated messages to RESTORE, BACKUP, and LOAD TABLE FROM MASTER
      99502158
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f8ddd2b2
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      f8ddd2b2
  4. 18 Feb, 2006 5 commits
    • unknown's avatar
      Fix after merge of 5.0, fix of a result file which somebody hadn't updated. · bac7f104
      unknown authored
      "mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
      partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)
      
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        compared with 5.0, this part has to move to the wrappers as the arg of --start-position depends on row-based or statement-based replication
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        result update
      mysql-test/r/rpl_row_UUID.result:
        result update (somebody had forgotten to run row-based tests, the solution is to use "make test" :)
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        merge from 5.0
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        merge form 5.0
      sql/mysqld.cc:
        fix after merge
      sql/sp_head.cc:
        fix after merge
      bac7f104
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-5.0 · b3621ef6
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-new
      
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      b3621ef6
    • unknown's avatar
      In previous push, a DROP TABLE at the end of test was missing. · 34d8c572
      unknown authored
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        result update
      mysql-test/t/mix_innodb_myisam_binlog.test:
        cleanup in the end
      34d8c572
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-5.0 · 16bc3763
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.
      
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/r/sql_mode.result:
        Auto merged
      mysql-test/t/rpl_sp-slave.opt:
        Auto merged
      mysql-test/t/rpl_sp.test:
        Auto merged
      mysql-test/t/sql_mode.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/log.cc:
        auto merged
      sql/mysqld.cc:
        will fix manually
      sql/sp_head.cc:
        will fix manually
      16bc3763
    • unknown's avatar
      Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the... · 8dc567db
      unknown authored
      Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest
      symptom). sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
      (where N is interpreted like if SQL_MODE was a field of type SET), so
      this bug affected recovery from binlogs if the server was running with certain SQL_MODE values,
      for example the default values on Windows (STRICT_TRANS_TABLES); to work around this bug people
      had to edit mysqlbinlog's output.
      
      
      mysql-test/r/sql_mode.result:
        result update
      mysql-test/t/sql_mode.test:
        test for various numeric SQL_MODE values
      sql/set_var.cc:
        For a set, it does not make sense to test if the supplied argument exceeds the number of elements in the set
        (such test would make sense for an enum), but rather to check if it exceeds 2^this (to verify
        that only reasonable bits are set).
      8dc567db