1. 10 Aug, 2001 4 commits
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 8af8098d
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      configure.in:
        Auto merged
      8af8098d
    • unknown's avatar
      merged · 9a6a7bf5
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/etc/ignore:
        auto-union
      Makefile.am:
        Auto merged
      ltmain.sh:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/t/bdb.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      9a6a7bf5
    • unknown's avatar
      Merge work:/home/bk/mysql · ebb3bd0f
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      ebb3bd0f
    • unknown's avatar
      mysqlbinlog->client · 8ddf0c44
      unknown authored
      
      BitKeeper/etc/ignore:
        Added client/log_event.cc client/log_event.h client/mf_iocache.c client/mf_iocache.cc client/mysqlbinlog client/mysys_priv.h mysql.kdevprj to the ignore list
      Makefile.am:
        do symlink hack in the client directory 
        ( originally needed to get log_event.cc for mysqlbinlog)
      client/mysqlbinlog.cc:
        fixes to make it compile in the client directory
      libmysql/Makefile.shared:
        link mysqlbinlog dependencies into libmysqlclient
      libmysql/libmysql.c:
        make simple_command and net_safe_read extern ( for mysqlbinlog)
      sql/log_event.cc:
        removed pthread dependency in mysqlbinlog
      sql/log_event.h:
        removed pthread dependency in mysqlbinlog
      8ddf0c44
  2. 09 Aug, 2001 11 commits
  3. 08 Aug, 2001 12 commits
  4. 07 Aug, 2001 2 commits
  5. 06 Aug, 2001 2 commits
    • unknown's avatar
      misc bug fixes · 4bb40187
      unknown authored
      
      libmysqld/Makefile.am:
        sql_unions -> sql_union
      BitKeeper/etc/ignore:
        Added libmysqld/sql_union.cc to the ignore list
      mysql-test/mysql-test-run.sh:
        fix to get path-independent logging
      mysql-test/r/rpl_log.result:
        fix for path-independent logging
      sql/log.cc:
        fixed compile error with USING_TRANSACTIONS
      sql/log_event.h:
        fixed compile error with USING_TRANSACTIONS
      4bb40187
    • unknown's avatar
      manual.texi added explicit entry for EXTRACT() function · a8c230ad
      unknown authored
      
      Docs/manual.texi:
        added explicit entry for EXTRACT() function
      a8c230ad
  6. 04 Aug, 2001 3 commits
    • unknown's avatar
      fixed error message numbers in union test · ad5100da
      unknown authored
      
      mysql-test/t/union.test:
        fixed error message numbers
      ad5100da
    • unknown's avatar
      srv0srv.h Support raw disk partitions as data files · c67510f0
      unknown authored
      srv0start.c	Support raw disk partitions as data files
      srv0srv.c	Support raw disk partitions as data files
      row0purge.c	< 4 GB rows, doublewrite, hang fixes
      row0row.c	< 4 GB rows, doublewrite, hang fixes
      row0sel.c	< 4 GB rows, doublewrite, hang fixes
      row0uins.c	< 4 GB rows, doublewrite, hang fixes
      row0umod.c	< 4 GB rows, doublewrite, hang fixes
      row0undo.c	< 4 GB rows, doublewrite, hang fixes
      row0upd.c	< 4 GB rows, doublewrite, hang fixes
      srv0srv.c	< 4 GB rows, doublewrite, hang fixes
      srv0start.c	< 4 GB rows, doublewrite, hang fixes
      sync0rw.c	< 4 GB rows, doublewrite, hang fixes
      sync0sync.c	< 4 GB rows, doublewrite, hang fixes
      trx0purge.c	< 4 GB rows, doublewrite, hang fixes
      trx0rec.c	< 4 GB rows, doublewrite, hang fixes
      trx0sys.c	< 4 GB rows, doublewrite, hang fixes
      btr0btr.c	< 4 GB rows, doublewrite, hang fixes
      btr0cur.c	< 4 GB rows, doublewrite, hang fixes
      buf0buf.c	< 4 GB rows, doublewrite, hang fixes
      buf0flu.c	< 4 GB rows, doublewrite, hang fixes
      buf0rea.c	< 4 GB rows, doublewrite, hang fixes
      data0data.c	< 4 GB rows, doublewrite, hang fixes
      fil0fil.c	< 4 GB rows, doublewrite, hang fixes
      fsp0fsp.c	< 4 GB rows, doublewrite, hang fixes
      ibuf0ibuf.c	< 4 GB rows, doublewrite, hang fixes
      lock0lock.c	< 4 GB rows, doublewrite, hang fixes
      log0log.c	< 4 GB rows, doublewrite, hang fixes
      log0recv.c	< 4 GB rows, doublewrite, hang fixes
      os0file.c	< 4 GB rows, doublewrite, hang fixes
      page0cur.c	< 4 GB rows, doublewrite, hang fixes
      pars0pars.c	< 4 GB rows, doublewrite, hang fixes
      rem0cmp.c	< 4 GB rows, doublewrite, hang fixes
      rem0rec.c	< 4 GB rows, doublewrite, hang fixes
      row0ins.c	< 4 GB rows, doublewrite, hang fixes
      row0mysql.c	< 4 GB rows, doublewrite, hang fixes
      univ.i  	< 4 GB rows, doublewrite, hang fixes
      data0data.ic	< 4 GB rows, doublewrite, hang fixes
      mach0data.ic	< 4 GB rows, doublewrite, hang fixes
      rem0rec.ic	< 4 GB rows, doublewrite, hang fixes
      row0upd.ic	< 4 GB rows, doublewrite, hang fixes
      trx0rec.ic	< 4 GB rows, doublewrite, hang fixes
      rem0cmp.h	< 4 GB rows, doublewrite, hang fixes
      rem0rec.h	< 4 GB rows, doublewrite, hang fixes
      row0ins.h	< 4 GB rows, doublewrite, hang fixes
      row0mysql.h	< 4 GB rows, doublewrite, hang fixes
      row0row.h	< 4 GB rows, doublewrite, hang fixes
      row0upd.h	< 4 GB rows, doublewrite, hang fixes
      srv0srv.h	< 4 GB rows, doublewrite, hang fixes
      sync0sync.h	< 4 GB rows, doublewrite, hang fixes
      trx0rec.h	< 4 GB rows, doublewrite, hang fixes
      trx0sys.h	< 4 GB rows, doublewrite, hang fixes
      trx0types.h	< 4 GB rows, doublewrite, hang fixes
      trx0undo.h	< 4 GB rows, doublewrite, hang fixes
      ut0dbg.h	< 4 GB rows, doublewrite, hang fixes
      ut0ut.h 	< 4 GB rows, doublewrite, hang fixes
      btr0btr.h	< 4 GB rows, doublewrite, hang fixes
      btr0cur.h	< 4 GB rows, doublewrite, hang fixes
      buf0buf.h	< 4 GB rows, doublewrite, hang fixes
      buf0flu.h	< 4 GB rows, doublewrite, hang fixes
      data0data.h	< 4 GB rows, doublewrite, hang fixes
      dict0mem.h	< 4 GB rows, doublewrite, hang fixes
      fil0fil.h	< 4 GB rows, doublewrite, hang fixes
      fsp0fsp.h	< 4 GB rows, doublewrite, hang fixes
      os0file.h	< 4 GB rows, doublewrite, hang fixes
      
      
      innobase/include/btr0btr.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/btr0cur.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/buf0buf.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/buf0flu.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/data0data.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/dict0mem.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/fil0fil.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/fsp0fsp.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/os0file.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/rem0cmp.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/rem0rec.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/row0ins.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/row0mysql.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/row0row.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/row0upd.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/sync0sync.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/trx0rec.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/trx0sys.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/trx0types.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/trx0undo.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/ut0dbg.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/ut0ut.h:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/data0data.ic:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/mach0data.ic:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/rem0rec.ic:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/row0upd.ic:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/trx0rec.ic:
        < 4 GB rows, doublewrite, hang fixes
      innobase/include/univ.i:
        < 4 GB rows, doublewrite, hang fixes
      innobase/btr/btr0btr.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/btr/btr0cur.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/buf/buf0buf.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/buf/buf0flu.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/buf/buf0rea.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/data/data0data.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/fil/fil0fil.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/fsp/fsp0fsp.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/ibuf/ibuf0ibuf.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/lock/lock0lock.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/log/log0log.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/log/log0recv.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/os/os0file.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/page/page0cur.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/pars/pars0pars.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/rem/rem0cmp.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/rem/rem0rec.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0ins.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0mysql.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0purge.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0row.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0sel.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0uins.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0umod.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0undo.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/row/row0upd.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/sync/sync0rw.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/sync/sync0sync.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/trx/trx0purge.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/trx/trx0rec.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/trx/trx0sys.c:
        < 4 GB rows, doublewrite, hang fixes
      innobase/srv/srv0srv.c:
        Support raw disk partitions as data files
      innobase/srv/srv0start.c:
        Support raw disk partitions as data files
      innobase/include/srv0srv.h:
        Support raw disk partitions as data files
      c67510f0
    • unknown's avatar
      new file_id generation method · 39045174
      unknown authored
      
      mysql-test/r/rpl_log.result:
        fixed result for new file_id generating method
      BitKeeper/etc/ignore:
        Added vio/viotest-ssl to the ignore list
      sql/log.cc:
        use a different method to generate unique file_id
      sql/log_event.cc:
        new file_id generationg method
      sql/sql_class.h:
        new file_id generationg method
      39045174
  7. 03 Aug, 2001 6 commits
    • unknown's avatar
      Fixed bad manual merge · ee82985a
      unknown authored
      
      Docs/manual.texi:
        Fixed bad merge
      ee82985a
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 8d89555e
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      8d89555e
    • unknown's avatar
      New error messages for MATCH and UNION · a8f2c247
      unknown authored
      a8f2c247
    • unknown's avatar
      LOAD DATA INFILE is now replicated properly, except for cleanup on · 0dab9f40
      unknown authored
      Stop event and bugs the test suite could not catch
      Did some big restructuring of binlog event classes - most important
      change is that now each event class has exec_event method and one does
      not need to modify slave core code to add a new event. Slave code is
      now much smaller and easier to read
      
      
      
      include/my_sys.h:
        pre_code and arg in IO_CACHE
      mysql-test/r/rpl_log.result:
        updated result for LOAD DATA INFILE fix
      mysys/mf_iocache.c:
        pre_close routine and arg pointer for callback magic
      sql/log.cc:
        changed MYSQL_LOG so that write() method is for generic
        Log_event - removed redundant code
      sql/log_event.cc:
        added classes for file events
        added exec_event() method to all classes
        restructured/cleaned up event classes
      sql/log_event.h:
        added classes for file events
        added exec_event() method to all classes
        restructured/cleaned up event classes
      sql/mf_iocache.cc:
        pre_close/arg
      sql/mysqld.cc:
        added slave-load-tmpdir and old-rpl-compat options
      sql/slave.cc:
        changed exec_event() to use Log_event::exec_event()
        some routines are now needed in log_event.cc and cannot be static/inline
        general cleanup
      sql/slave.h:
        some routines are now extern because they are called from log_event.cc
      sql/sql_class.cc:
        added slave_net
      sql/sql_class.h:
        added slave_net to THD
        MYSQL_LOG::write now handles generic Log_event
      sql/sql_load.cc:
        changes for new handling of LOAD DATA INFILE replication
      sql/sql_repl.cc:
        added log_loaded_block() callback for IO_CACHE
      sql/sql_repl.h:
        added structure to pass args to IO_CACHE callback from mysql_load
      0dab9f40
    • unknown's avatar
      Take Jeremy's manual.texi; Will patch this with the deleted text · 6d5720d1
      unknown authored
      
      Docs/manual.texi:
        Take Jeremy's version; Will patch this with the deleted text
      6d5720d1
    • unknown's avatar
      Fix when using --without-server --with-thread-safe-client · 9d7a659b
      unknown authored
      Added prototype for my_thread_end
      New error message for MATCH
      Give error when using myisamchk --force --readonly
      
      
      BitKeeper/deleted/.del-fulltext_join.test~e347c8f04405c916:
        Delete: mysql-test/t/fulltext_join.test
      Docs/manual.texi:
        Added node to fulltext
      configure.in:
        Fix when using --without-server --with-thread-safe-client
      include/mysql_com.h:
        Added prototype for my_thread_end
      include/mysqld_error.h:
        New error message for MATCH
      myisam/myisamchk.c:
        Give error when using --force --readonly
      mysql-test/t/fulltext.test:
        Added test for error conditons with fulltext
      sql/item_func.cc:
        Fixed error messages when using MATCH ... AGAINST
      sql/mysqld.cc:
        Portability fix
      sql/share/czech/errmsg.txt:
        New error message when using MATCH
      sql/share/danish/errmsg.txt:
        New error message when using MATCH
      sql/share/dutch/errmsg.txt:
        New error message when using MATCH
      sql/share/english/errmsg.txt:
        New error message when using MATCH
      sql/share/estonian/errmsg.txt:
        New error message when using MATCH
      sql/share/french/errmsg.txt:
        New error message when using MATCH
      sql/share/german/errmsg.txt:
        New error message when using MATCH
      sql/share/greek/errmsg.txt:
        New error message when using MATCH
      sql/share/hungarian/errmsg.txt:
        New error message when using MATCH
      sql/share/italian/errmsg.txt:
        New error message when using MATCH
      sql/share/japanese/errmsg.txt:
        New error message when using MATCH
      sql/share/korean/errmsg.txt:
        New error message when using MATCH
      sql/share/norwegian-ny/errmsg.txt:
        New error message when using MATCH
      sql/share/norwegian/errmsg.txt:
        New error message when using MATCH
      sql/share/polish/errmsg.txt:
        New error message when using MATCH
      sql/share/portuguese/errmsg.txt:
        New error message when using MATCH
      sql/share/romanian/errmsg.txt:
        New error message when using MATCH
      sql/share/russian/errmsg.txt:
        New error message when using MATCH
      sql/share/slovak/errmsg.txt:
        New error message when using MATCH
      sql/share/spanish/errmsg.txt:
        New error message when using MATCH
      sql/share/swedish/errmsg.OLD:
        New error message when using MATCH
      sql/share/swedish/errmsg.txt:
        New error message when using MATCH
      9d7a659b