An error occurred fetching the project authors.
  1. 20 Feb, 2006 11 commits
  2. 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
  3. 18 Feb, 2006 16 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
    • unknown's avatar
      Fix for BUG#14769 "Function fails to replicate if fails half-way (slave stops)": · 8470ae9c
      unknown authored
      if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
      slave would stop and complain that error code between him and master mismatch. 
      To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
      call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
      And: minor wording change in the help text.
      This cset will cause conflicts in 5.1, I'll merge.
      
      
      mysql-test/r/rpl_sp.result:
        result update
      mysql-test/t/rpl_sp-slave.opt:
        bug just fixed so option not needed
      mysql-test/t/rpl_sp.test:
        test for more half-failed functions with DO and SELECT, to test the bug of this changeset.
        cleanup at the end.
      sql/mysqld.cc:
        function -> stored function (change suggested by Paul)
      sql/sp_head.cc:
        When a function updates data and is called from a non-binlogged statement (SELECT, DO), we binlog it 
        as SELECT myfunc(), and not DO myfunc() like before.
      8470ae9c
    • unknown's avatar
      Fix for BUG#16559 "Replication Problems with Non transactional tables inside... · cefc0b6d
      unknown authored
      Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.":
      problem was: when a connection disconnects having an open transaction affecting MyISAM and InnoDB, the ROLLBACK event stored in the binary log
      contained a non-zero error code (1053 because of the disconnection), so when slave applied the transaction, slave complained that its ROLLBACK succeeded
      (error_code=0) while master's had 1053, so slave stopped. But internally generated binlog events such as this ROLLBACK
      should always have 0 as error code, as is true in 4.1 and was accidentally broken in 5.0,
      so that there is no false alarm.
      
      
      mysql-test/r/mix_innodb_myisam_binlog.result:
        result update
      mysql-test/t/mix_innodb_myisam_binlog.test:
        test for BUG#16559
      sql/log.cc:
        Internally generated binlog events should always have an error code of zero (like in 4.1; in 5.0 this was accidentally broken).
      cefc0b6d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 309f51cd
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      309f51cd
    • unknown's avatar
      Fix build failure · c8073e58
      unknown authored
      c8073e58
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message · ff94b124
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug
      
      
      mysql-test/r/im_life_cycle.result:
        Auto merged
      mysql-test/t/im_life_cycle.imtest:
        Auto merged
      ff94b124
    • unknown's avatar
      mysqlimport.c: · 4bc61ff9
      unknown authored
        Handle case where there is no snprintf()
      libmysql.vcproj, mysqlclient.vcproj:
        Added __WIN__ symbol, needed when compiling dbug.c
      dbug.vcproj:
        Changed __WIN32__ to __WIN__
      dbug.c:
        Added Windows specific code to handle TIMESTAMP_ON log line format
      make_win_src_distribution.sh:
        Copy plugin directory recursively
      dbug.vcproj:
        Define __WIN__ for all targets
      
      
      scripts/make_win_src_distribution.sh:
        Copy plugin directory recursively
      dbug/dbug.c:
        Added Windows specific code to handle TIMESTAMP_ON log line format
      VC++Files/client/mysqlclient.vcproj:
        Added __WIN__ symbol, needed when compiling dbug.c
      VC++Files/dbug/dbug.vcproj:
        Changed __WIN32__ to __WIN__
      VC++Files/libmysql/libmysql.vcproj:
        Added __WIN__ symbol, needed when compiling dbug.c
      client/mysqlimport.c:
        Handle case where there is no snprintf()
      4bc61ff9
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b3d7c316
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      mysql-test/t/disabled.def:
        Auto merged
      b3d7c316
    • unknown's avatar
      Makefile.am: · 3470647a
      unknown authored
        Add an extra -lpthread before first -lc, to solve link
        problems when statically linking with glibc 2.2.5
      make_win_src_distribution.sh:
        Added copying of the include/mysql directory
      
      
      scripts/make_win_src_distribution.sh:
        Added copying of the include/mysql directory
      client/Makefile.am:
        Add redundant CLIENT_THREAD_LIBS to LDADD, to make -lpthread go before
        -lc, required for the static linking with glibc 2.2.5 to work.
      3470647a
    • unknown's avatar
      Add a shift in the parser. Forgotten in the previous commit. · 187aab97
      unknown authored
      server-tools/instance-manager/parse.cc:
        shift the second value for the log
      187aab97
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9dadc39f
      unknown authored
      into  zim.tangent.org:/home/brian/mysql/dep-5.1
      
      
      sql/sql_plugin.cc:
        SCCS merged
      9dadc39f
    • unknown's avatar
      Removing support for storage engines being loadable, will push featureto 5.2. · f34a66de
      unknown authored
      sql/sql_plugin.cc:
        Removed support for Storage gneines.
      f34a66de
  4. 17 Feb, 2006 5 commits
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/trees/5.0/mysql-5.0-virgin-debug · a2c1e816
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
      
      
      a2c1e816
    • unknown's avatar
      Fix results due to change in SHOW CREATE TABLE output · 338707ad
      unknown authored
      mysql-test/r/ndb_bitfield.result:
        Update result
      mysql-test/r/ndb_dd_basic.result:
        Update result
      mysql-test/r/ndb_dd_disk2memory.result:
        Update result
      mysql-test/r/ndb_partition_key.result:
        Update result
      mysql-test/r/ndb_partition_range.result:
        Update result
      mysql-test/r/ndb_temporary.result:
        Update result
      mysql-test/r/rpl_ndb_UUID.result:
        Update result
      338707ad
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 73765e53
      unknown authored
      into  mysql.com:/space/pekka/ndb/version/my51
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      73765e53
    • unknown's avatar
      ndb - rbr blobs: fixes (not final) · 1cedcdd2
      unknown authored
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        invalidate table=>invalidate blob tables
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        invalidate table=>invalidate blob tables
      storage/ndb/src/ndbapi/DictCache.cpp:
        DBUG_PRINT
      sql/ha_ndbcluster.cc:
        avoid discovering NDB$BLOB tables
      mysql-test/t/disabled.def:
        rpl_ndb_blob passes again
      1cedcdd2
    • unknown's avatar
      mysql-test-run.sh: · 8c62b871
      unknown authored
        Set the ndbcluster slave port (bug#16780)
      disabled.def:
        Disabled 'mysqldump' until bug 17443 is closed
      
      
      mysql-test/t/disabled.def:
        Disabled 'mysqldump' until bug 17443 is closed
      mysql-test/mysql-test-run.sh:
        Set the ndbcluster slave port (bug#16780)
      8c62b871