1. 01 Mar, 2004 3 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 · 190a65bf
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.0
      
      190a65bf
    • unknown's avatar
      Fix for BUG#3015 · 26ed1df0
      unknown authored
      "(binlog, position) stored by InnoDB for a replication slave can be wrong".
      This code contains conditional #if to distinguish between versions;
      it should be merged into 4.1 and 5.0.
      
      
      sql/ha_innodb.cc:
        correcting the binlog position stored in InnoDB in a slave.
      sql/log_event.cc:
        better code to store the binlog position in InnoDB for a slave.
      sql/slave.h:
        Better code for storing the binlog position in InnoDB for a slave.
      26ed1df0
    • unknown's avatar
      Merge ubayer@bk-internal.mysql.com:/home/bk/mysql-4.0 · 46143e78
      unknown authored
      into morbus.(none):/home/ulli/work/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      46143e78
  2. 29 Feb, 2004 1 commit
    • unknown's avatar
      Fix for BUG#3017 · 048cf88d
      unknown authored
      "wrong Relay_Log_Pos if Rotate is in the middle of a transaction in relay log"
      increment 'pending' instead of 'relay_log_pos'.
      
      
      mysql-test/r/rpl_trunc_binlog.result:
        result update
      sql/log_event.cc:
        - corrected error message
        - in Rotate_log_event::exec_event(), if we're in a transaction (which
        can happen if the I/O slave thread reconnected while reading a
        transaction), don't increment relay_log_pos but pending instead.
        Otherwise, relay_log_pos becomes garbage (and so if slave stops at that
        moment, it will never restart).
      048cf88d
  3. 28 Feb, 2004 1 commit
  4. 27 Feb, 2004 2 commits
    • unknown's avatar
      Changes to fix errors encountered in test builds on Windows. · c995b662
      unknown authored
      
      VC++Files/innobase/innobase.dsp:
        odbc0odbc.c was removed from the tree.
      VC++Files/libmysql/libmysql.dsp:
        strxnmov.c is needed in this module.
      sql/log_event.cc:
        Cast required to resolve compile error on Windows - byte * is 
        not equivalent to char *.
      sql/opt_range.cc:
        Cast to const char * required to resolve compile error on Windows.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      c995b662
    • unknown's avatar
      row0upd.c: · 35dfbbca
      unknown authored
        Fix bug: in a FOREIGN KEY, ON UPDATE CASCADE was not triggered if the update changed a string to another value identical in alphabetical ordering, e.g., abc -> aBc
      
      
      innobase/row/row0upd.c:
        Fix bug: in a FOREIGN KEY, ON UPDATE CASCADE was not triggered if the update changed a string to another value identical in alphabetical ordering, e.g., abc -> aBc
      35dfbbca
  5. 26 Feb, 2004 2 commits
    • unknown's avatar
      fix for bug #2905 - · 9cac724c
      unknown authored
      "mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port"
      
      
      client/mysqladmin.c:
        changed the value after REQUIRED_ARG from 0 to MYSQL_PORT
      client/mysqltest.c:
        changed the value after REQUIRED_ARG from 0 to MYSQL_PORT
      client/thread_test.c:
        changed the value after REQUIRED_ARG from 0 to MYSQL_PORT
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      9cac724c
    • unknown's avatar
  6. 25 Feb, 2004 2 commits
  7. 24 Feb, 2004 5 commits
  8. 23 Feb, 2004 3 commits
  9. 22 Feb, 2004 5 commits
  10. 21 Feb, 2004 10 commits
  11. 20 Feb, 2004 6 commits
    • unknown's avatar
      Added missing argument to strxnmov() (Applies for windows debug mode) · 1da0c854
      unknown authored
      
      libmysql/libmysql.c:
        Added missing argument to strxnmov()
      1da0c854
    • unknown's avatar
      Fix name conflict with alternate capitalization · 20052e66
      unknown authored
      
      VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old:
        Rename: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old
      VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old:
        Rename: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old
      VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old:
        Rename: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul -> VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old
      20052e66
    • unknown's avatar
      Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0 · c744bd65
      unknown authored
      into mysql.com:/bk/mysql-4.0
      
      c744bd65
    • unknown's avatar
      Remove unused files · 415012e8
      unknown authored
      .del-odbc0odbc.c~6a372e94945263b5:
        Delete: innobase/odbc/odbc0odbc.c
      .del-odbc0dummy.c~761be78656f44ad2:
        Delete: innobase/odbc/odbc0dummy.c
      .del-makefilewin~15bf11ba8e0e4efe:
        Delete: innobase/odbc/makefilewin
      .del-Makefile.am~f40398b15a266f24:
        Delete: innobase/odbc/Makefile.am
      
      
      BitKeeper/deleted/.del-Makefile.am~f40398b15a266f24:
        Delete: innobase/odbc/Makefile.am
      BitKeeper/deleted/.del-makefilewin~15bf11ba8e0e4efe:
        Delete: innobase/odbc/makefilewin
      BitKeeper/deleted/.del-odbc0dummy.c~761be78656f44ad2:
        Delete: innobase/odbc/odbc0dummy.c
      BitKeeper/deleted/.del-odbc0odbc.c~6a372e94945263b5:
        Delete: innobase/odbc/odbc0odbc.c
      415012e8
    • unknown's avatar
      Merge marko@build.mysql.com:/home/bk/mysql-4.0 · 474bc851
      unknown authored
      into hundin.mysql.fi:/home/marko/m/mysql-4.0
      
      
      innobase/que/que0que.c:
        Auto merged
      474bc851
    • unknown's avatar
      Many files: · 04a7c9eb
      unknown authored
        Removed unused code
      .del-os0trash.c~8cae5c1695501117:
        Delete: innobase/os/os0trash.c
      dict0crea.c:
        Protect all sprintf(%s) with assertions
      
      
      BitKeeper/deleted/.del-os0trash.c~8cae5c1695501117:
        Delete: innobase/os/os0trash.c
      innobase/btr/btr0sea.c:
        Removed unused code
      innobase/buf/buf0buf.c:
        Removed unused code
      innobase/com/com0shm.c:
        Removed unused code
      innobase/data/data0data.c:
        Removed unused code
      innobase/dict/dict0crea.c:
        Removed unused code
      innobase/fsp/fsp0fsp.c:
        Removed unused code
      innobase/ha/ha0ha.c:
        Removed unused code
      innobase/include/btr0cur.h:
        Removed unused code
      innobase/include/btr0sea.h:
        Removed unused code
      innobase/include/buf0buf.ic:
        Removed unused code
      innobase/include/data0data.h:
        Removed unused code
      innobase/include/dict0crea.h:
        Removed unused code
      innobase/include/dict0dict.h:
        Removed unused code
      innobase/include/ibuf0ibuf.h:
        Removed unused code
      innobase/include/lock0lock.h:
        Removed unused code
      innobase/include/mem0dbg.h:
        Removed unused code
      innobase/include/mem0mem.ic:
        Removed unused code
      innobase/include/mtr0log.h:
        Removed unused code
      innobase/include/mtr0mtr.h:
        Removed unused code
      innobase/include/os0proc.h:
        Removed unused code
      innobase/include/os0thread.h:
        Removed unused code
      innobase/include/rem0cmp.ic:
        Removed unused code
      innobase/include/row0row.h:
        Removed unused code
      innobase/include/srv0srv.h:
        Removed unused code
      innobase/include/sync0sync.h:
        Removed unused code
      innobase/lock/lock0lock.c:
        Removed unused code
      innobase/log/log0recv.c:
        Removed unused code
      innobase/mem/mem0dbg.c:
        Removed unused code
      innobase/mtr/mtr0mtr.c:
        Removed unused code
      innobase/os/os0proc.c:
        Removed unused code
      innobase/page/page0page.c:
        Removed unused code
      innobase/que/que0que.c:
        Removed unused code
      innobase/rem/rem0cmp.c:
        Removed unused code
      innobase/row/row0ins.c:
        Removed unused code
      innobase/row/row0mysql.c:
        Removed unused code
      innobase/row/row0row.c:
        Removed unused code
      innobase/srv/srv0srv.c:
        Removed unused code
      innobase/srv/srv0start.c:
        Removed unused code
      innobase/sync/sync0sync.c:
        Removed unused code
      innobase/trx/trx0rec.c:
        Removed unused code
      innobase/trx/trx0trx.c:
        Removed unused code
      innobase/ut/ut0dbg.c:
        Removed unused code
      innobase/ut/ut0mem.c:
        Removed unused code
      innobase/ut/ut0ut.c:
        Removed unused code
      04a7c9eb