1. 08 Dec, 2000 1 commit
    • unknown's avatar
      more cleanup of slave load data infile - trying to track down bug, · 4d3f7926
      unknown authored
      
      BitKeeper/etc/ignore:
        Added BitKeeper/tmp/applied.list BitKeeper/tmp/backup.list BitKeeper/tmp/backup.sfio BitKeeper/tmp/sfile.list to the ignore list
      sql/slave.cc:
        log warnings from replicated load data infile
      sql/sql_load.cc:
        do not log load data infile from the master to update log on the slave
      4d3f7926
  2. 07 Dec, 2000 25 commits
    • unknown's avatar
      rpl000001 sporadic failure mystery solved - the table was being opened twice :-) · bbc25ae6
      unknown authored
      
      BitKeeper/etc/ignore:
        Added mysql-test/var/slave-data/mysql-bin.001 mysql-test/var/slave-data/mysql-bin.002 mysql-test/var/slave-data/mysql-bin.003 mysql-test/var/slave-data/mysql-bin.004 mysql-test/var/slave-data/mysql-bin.005 mysql-test/var/slave-data/mysql-bin.006 mysql-test/var/slave-data/mysql-bin.007 mysql-test/var/slave-data/mysql-bin.008 mysql-test/var/slave-data/mysql-bin.009 mysql-test/var/slave-data/mysql-bin.010 mysql-test/var/slave-data/mysql-bin.011 mysql-test/var/slave-data/mysql-bin.012 mysql-test/var/slave-data/mysql-bin.013 mysql-test/var/slave-data/mysql-bin.014 mysql-test/var/slave-data/mysql-bin.index to the ignore list
      mysql-test/mysql-test-run:
        re-added --log-bin --log-slave updates to slave startup options
      sql/slave.cc:
        fixed bug in LOAD DATA INFILE replication
      bbc25ae6
    • unknown's avatar
      mysql-test/Makefile.am · 8a61d511
      unknown authored
          removed extra files, adjusted for renames
      
      
      mysql-test/Makefile.am:
        removed extra files, adjusted for renames
      8a61d511
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · 47d7fe9e
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      Build-tools/Do-all-build-steps:
        Auto merged
      47d7fe9e
    • unknown's avatar
      Do-all-build-steps added --without-berkeley-db · 9ae7f931
      unknown authored
      
      Build-tools/Do-all-build-steps:
        added --without-berkeley-db
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      9ae7f931
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · 4b262c5d
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      4b262c5d
    • unknown's avatar
      ok, here comes the push - prepare to resolve conflicts! And lets hope bk can... · 4512b01c
      unknown authored
      ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames
      
      
      BitKeeper/etc/ignore:
        Added mysql-test/var/lib/test/test3.frm mysql-test/var/lib/test/test3.MRG to the ignore list
      mysql-test/t/mrg000001.test:
        fixed paths
      sql/log.cc:
        fixed mutex problem
      4512b01c
    • unknown's avatar
      Added documentation about the mysql client. · 78360137
      unknown authored
      78360137
    • unknown's avatar
      make -j 2 · 3e9523d2
      unknown authored
      
      BUILD/compile-pentium-gcov:
        use second CPU
      BUILD/compile-pentium:
        I got my second CPU
      Build-tools/Do-all-build-steps:
        use second CPU
      Build-tools/Do-compile:
        use second CPU
      3e9523d2
    • unknown's avatar
      mrg000001.dummy.result Rename: mysql-test/r/3.23/mrg000001.dummy.result ->... · 8f4a1533
      unknown authored
      mrg000001.dummy.result	Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result
      mrg000001.result	Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result
      mrg000001.test	Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test
      
      
      mysql-test/t/mrg000001.test:
        Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test
      mysql-test/r/mrg000001.dummy.result:
        Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result
      mysql-test/r/mrg000001.result:
        Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result
      8f4a1533
    • unknown's avatar
      Merge · a768562a
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Auto converge
      configure.in:
        Auto merged
      mysql-test/misc/select.res:
        ***MISSING WEAVE***
      BitKeeper/etc/ignore:
        Added BitKeeper/etc/config BitKeeper/tmp/CONTENTS BitKeeper/tmp/patch BitKeeper/tmp/pid to the ignore list
      mysql-test/mysql-test-run:
        merge
      a768562a
    • unknown's avatar
      stop chewing! · a6185354
      unknown authored
      
      mysql-test/misc/mysql-test_V1.9.pl:
        mvdir
      mysql-test/misc/select.res:
        ***MISSING WEAVE***
      mysql-test/misc/select.tst:
        mvdir
      a6185354
    • unknown's avatar
      chew it! · 593e4432
      unknown authored
      
      mysql-test/chew_on_this/select.res:
        ***MISSING WEAVE***
      593e4432
    • unknown's avatar
      chew on! · 0a8aef41
      unknown authored
      
      mysql-test/chew_on_this/select.res:
        ***MISSING WEAVE***
      0a8aef41
    • unknown's avatar
      chew on this! · 9779b054
      unknown authored
      
      mysql-test/chew_on_this/select.res:
        ***MISSING WEAVE***
      9779b054
    • unknown's avatar
      fixed up mysql-test - will not push this yet, as more clean up/testing is to follow · 1a603185
      unknown authored
      
      BitKeeper/deleted/.del-README~b8e00a1b57b91f69:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-README~2bddc2706d0834d0:
        ***MISSING WEAVE***
      mysql-test/r/alt000001.result:
        mvdir
      mysql-test/r/ins000001.result:
        mvdir
      mysql-test/r/rpl000001.a.result:
        mvdir
      mysql-test/r/rpl000001.b.result:
        mvdir
      mysql-test/r/rpl000002.result:
        mvdir
      mysql-test/r/rpl000003.result:
        mvdir
      mysql-test/r/rpl000004.a.result:
        mvdir
      mysql-test/r/rpl000004.b.result:
        mvdir
      mysql-test/r/rpl000005.result:
        mvdir
      mysql-test/r/rpl000006.result:
        mvdir
      mysql-test/r/rpl000007.result:
        mvdir
      mysql-test/r/rpl000008.result:
        mvdir
      mysql-test/r/rpl000009.result:
        mvdir
      mysql-test/r/rpl000010.result:
        mvdir
      mysql-test/r/rpl000011.result:
        mvdir
      mysql-test/r/rpl000012.result:
        mvdir
      mysql-test/r/rpl000012.status.result:
        mvdir
      mysql-test/r/rpl000013.result:
        mvdir
      mysql-test/r/rpl000013.status.result:
        mvdir
      mysql-test/r/sel000001.result:
        mvdir
      mysql-test/r/sel000002.result:
        mvdir
      mysql-test/r/sel000003.result:
        mvdir
      mysql-test/r/sel000004.result:
        mvdir
      mysql-test/r/sel000005.result:
        mvdir
      mysql-test/r/sel000006.result:
        mvdir
      mysql-test/r/sel000007.result:
        mvdir
      mysql-test/r/sel000008.result:
        mvdir
      mysql-test/r/sel000009.result:
        mvdir
      mysql-test/r/sel000010.result:
        mvdir
      mysql-test/r/sel000011.result:
        mvdir
      mysql-test/r/sel000012.result:
        mvdir
      mysql-test/r/sel000013.result:
        mvdir
      mysql-test/r/sel000014.result:
        mvdir
      mysql-test/r/sel000015.result:
        mvdir
      mysql-test/r/sel000016.result:
        mvdir
      mysql-test/r/sel000017.result:
        mvdir
      mysql-test/r/sel000018.result:
        mvdir
      mysql-test/r/sel000019.result:
        mvdir
      mysql-test/r/sel000020.result:
        mvdir
      mysql-test/r/sel000021.result:
        mvdir
      mysql-test/r/sel000022.result:
        mvdir
      mysql-test/r/sel000023.result:
        mvdir
      mysql-test/r/sel000024.result:
        mvdir
      mysql-test/r/sel000025.result:
        mvdir
      mysql-test/r/sel000026.result:
        mvdir
      mysql-test/r/sel000027.result:
        mvdir
      mysql-test/r/sel000028.result:
        mvdir
      mysql-test/r/sel000029.result:
        mvdir
      mysql-test/r/sel000030.result:
        mvdir
      mysql-test/r/sel000100.result:
        mvdir
      mysql-test/r/shw000001.result:
        mvdir
      mysql-test/t/README:
        mvdir
      mysql-test/t/err000001.test:
        mvdir
      mysql-test/t/rpl000007-slave.opt:
        mvdir
      mysql-test/t/rpl000008-slave.opt:
        mvdir
      mysql-test/t/rpl000009-slave.opt:
        mvdir
      mysql-test/t/rpl000010-slave.opt:
        mvdir
      mysql-test/t/rpl000013-slave.opt:
        mvdir
      BitKeeper/deleted/.del-start-mysqld~9c8f21a7ab97793a:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-stop-mysqld~89a1194045f05d1c:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-translate-tests~3869c1fdf0a5ea1a:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-README~108667adaeabe3f5:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-README~c5aaceda4c2b1a8:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-select-key.master~e6b83af25df0ce5:
        ***MISSING WEAVE***
      mysql-test/std_data/words.dat:
        Rename: mysql-test/std_data/words -> mysql-test/std_data/words.dat
      BitKeeper/deleted/.del-simple-select.master~6f3eb98812926caf:
        ***MISSING WEAVE***
      Makefile.am:
        add mysql-test to distribution
      configure.in:
        added mysql-test
      libmysql/Makefile.am:
        include hash.h
      libmysql/Makefile.shared:
        add hash to libmysqlclient
      mysql-test/Makefile.am:
        mysql-test is now in source dist also
      mysql-test/chew_on_this/select.res:
        ***MISSING WEAVE***
      mysql-test/install_test_db:
        renamed file, moved to different directory, and fixed up to work on binary dist
      mysql-test/mysql-test-run:
        clean-up of test suite, make it work on binary dist
      mysql-test/t/alt000001.test:
        moved directory
      mysql-test/t/ins000001.test:
        moved directory
      mysql-test/t/rpl000001.test:
        moved dir
      mysql-test/t/rpl000002.test:
        moved dir
      mysql-test/t/rpl000003.test:
        moved dir
      mysql-test/t/rpl000004.test:
        moved dir
      mysql-test/t/rpl000005.test:
        moved dir
      mysql-test/t/rpl000006.test:
        moved dir
      mysql-test/t/rpl000007.test:
        moved dir
      mysql-test/t/rpl000008.test:
        moved dir
      mysql-test/t/rpl000009.test:
        moved dir
      mysql-test/t/rpl000010.test:
        moved dir
      mysql-test/t/rpl000011.test:
        moved dir
      mysql-test/t/rpl000012.test:
        moved dir
      mysql-test/t/rpl000013.test:
        moved dir
      mysql-test/t/sel000001.test:
        moved dir
      mysql-test/t/sel000002.test:
        moved dir
      BitKeeper/etc/ignore:
        Added libmysql_r/hash.c scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz to the ignore list
      mysql-test/t/sel000003.test:
        moved dir
      mysql-test/t/sel000004.test:
        moved dir
      mysql-test/t/sel000005.test:
        moved dir
      mysql-test/t/sel000100.test:
        moved dir
      mysql-test/t/shw000001.test:
        moved dir
      scripts/make_binary_distribution.sh:
        fixes to include mysql-test
        added -debug option to exit after building temp dir before tar.gz 
        removed a bunch of SCCS files
      1a603185
    • unknown's avatar
      Merge · d81d5295
      unknown authored
      
      sql/sql_base.cc:
        merged
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d81d5295
    • unknown's avatar
      Changed name mysql_multi_mysqld to mysqld_multi. · 54649a94
      unknown authored
      
      Docs/manual.texi:
        Changed name mysql_multi_mysqld to mysqld_multi.
        This is because safe_mysqld will be converted to mysqld_safe
        in the future and the new name is shorter than the old one.
      scripts/Makefile.am:
        Added mysqld_multi
      scripts/mysqld_multi.sh:
        Changed name from mysql_multi_mysqld to mysqld_multi
      54649a94
    • unknown's avatar
      myrg_rrnd.c merge+insert (alternate take) · 5496809d
      unknown authored
      myrg_info.c	merge+insert (alternate take)
      myrg_extra.c	merge+insert (alternate take)
      mymrgdef.h	merge+insert (alternate take)
      sql_base.cc	open_table --> open_or_reset_table (needed for MERGE)
      
      
      sql/sql_base.cc:
        open_table --> open_or_reset_table (needed for MERGE)
      myisammrg/mymrgdef.h:
        merge+insert (alternate take)
      myisammrg/myrg_extra.c:
        merge+insert (alternate take)
      myisammrg/myrg_info.c:
        merge+insert (alternate take)
      myisammrg/myrg_rrnd.c:
        merge+insert (alternate take)
      5496809d
    • unknown's avatar
      Added documentation about mysql_multi_mysqld. · d4fb3eec
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d4fb3eec
    • unknown's avatar
      Fix compilation bugs · ea979be6
      unknown authored
      
      Docs/manual.texi:
        Updated nodes
      sql/ha_berkeley.cc:
        Don't count deletes
      ea979be6
    • unknown's avatar
      merge · 22ad54ae
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      22ad54ae
    • unknown's avatar
      Merge · 8088e856
      unknown authored
      
      mysql-test/chew_on_this/select.res:
        ***MISSING WEAVE***
      8088e856
    • unknown's avatar
      Bug fix, max_heap_table_size variable was not used. · 034e028d
      unknown authored
      
      Docs/manual.texi:
        Bug fix with HEAP type tables.
      034e028d
    • unknown's avatar
      Only write full transactions to binary log · 29907fc5
      unknown authored
      A lot of new functions for BDB tables
      Fix for DROP DATABASE on windows
      Default server_id variables
      
      
      Docs/manual.texi:
        Update of BDB info + Changes
      configure.in:
        Added test of readlink
      include/mysqld_error.h:
        Added new error message
      sql/ha_berkeley.cc:
        Added storing of status, CHECK, ANALYZE and OPTIMIZE TABLE
      sql/ha_berkeley.h:
        Added storing of status, CHECK, ANALYZE and OPTIMIZE TABLE
      sql/handler.cc:
        Only write full transactions to binary log
      sql/hostname.cc:
        cleanup
      sql/log.cc:
        Only write full transactions to binary log
      sql/log_event.h:
        Only write full transactions to binary log
      sql/mf_iocache.cc:
        Changes to be able to use IO_CACHE to save statements in a transaction
      sql/mysql_priv.h:
        New variables
      sql/mysqld.cc:
        Only write full transactions to binary log
        Added default values for server_id
        Lots of new bdb options
      sql/share/czech/errmsg.sys:
        Added new error message
      sql/share/czech/errmsg.txt:
        Added new error message
      sql/share/danish/errmsg.sys:
        Added new error message
      sql/share/danish/errmsg.txt:
        Added new error message
      sql/share/dutch/errmsg.sys:
        Added new error message
      sql/share/dutch/errmsg.txt:
        Added new error message
      sql/share/english/errmsg.sys:
        Added new error message
      sql/share/english/errmsg.txt:
        Added new error message
      sql/share/estonian/errmsg.sys:
        Added new error message
      sql/share/estonian/errmsg.txt:
        Added new error message
      sql/share/french/errmsg.sys:
        Added new error message
      sql/share/french/errmsg.txt:
        Added new error message
      sql/share/german/errmsg.sys:
        Added new error message
      sql/share/german/errmsg.txt:
        Added new error message
      sql/share/greek/errmsg.sys:
        Added new error message
      sql/share/greek/errmsg.txt:
        Added new error message
      sql/share/hungarian/errmsg.sys:
        Added new error message
      sql/share/hungarian/errmsg.txt:
        Added new error message
      sql/share/italian/errmsg.sys:
        Added new error message
      sql/share/italian/errmsg.txt:
        Added new error message
      sql/share/japanese/errmsg.sys:
        Added new error message
      sql/share/japanese/errmsg.txt:
        Added new error message
      sql/share/korean/errmsg.sys:
        Added new error message
      sql/share/korean/errmsg.txt:
        Added new error message
      sql/share/norwegian-ny/errmsg.txt:
        Added new error message
      sql/share/norwegian/errmsg.txt:
        Added new error message
      sql/share/polish/errmsg.sys:
        Added new error message
      sql/share/polish/errmsg.txt:
        Added new error message
      sql/share/portuguese/errmsg.sys:
        Added new error message
      sql/share/portuguese/errmsg.txt:
        Added new error message
      sql/share/romanian/errmsg.txt:
        Added new error message
      sql/share/russian/errmsg.sys:
        Added new error message
      sql/share/russian/errmsg.txt:
        Added new error message
      sql/share/slovak/errmsg.sys:
        Added new error message
      sql/share/slovak/errmsg.txt:
        Added new error message
      sql/share/spanish/errmsg.sys:
        Added new error message
      sql/share/spanish/errmsg.txt:
        Added new error message
      sql/share/swedish/errmsg.OLD:
        Added new error message
      sql/share/swedish/errmsg.sys:
        Added new error message
      sql/share/swedish/errmsg.txt:
        Added new error message
      sql/sql_base.cc:
        cleanup
      sql/sql_class.cc:
        Only write full transactions to binary log
      sql/sql_class.h:
        Added error handling of failed writes to logs
      sql/sql_db.cc:
        Fix for DROP DATABASE on windows
      sql/sql_delete.cc:
        Only write full transactions to binary log
      sql/sql_insert.cc:
        Only write full transactions to binary log
      sql/sql_load.cc:
        Only write full transactions to binary log
      sql/sql_parse.cc:
        End transaction at DROP, RENAME, CREATE and TRUNCATE
      sql/sql_table.cc:
        Fixes for ALTER TABLE on BDB tables for windows
      sql/sql_update.cc:
        Only write full transactions to binary log
      sql/sql_yacc.yy:
        AGAINST is not anymore a reserved word
      support-files/my-huge.cnf.sh:
        Changed to use binary log
      support-files/my-large.cnf.sh:
        Changed to use binary log
      support-files/my-medium.cnf.sh:
        Changed to use binary log
      support-files/my-small.cnf.sh:
        Changed to use binary log
      29907fc5
    • unknown's avatar
      Added a new client, mysql_multi_mysqld and documentation about it. · a3badce6
      unknown authored
      
      Docs/manual.texi:
        Added documentation about new client, mysql_multi_mysqld.
        This program is meant for managing multiple MySQL servers.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      a3badce6
  3. 06 Dec, 2000 6 commits
    • unknown's avatar
      Merge · 60b579a9
      unknown authored
      60b579a9
    • unknown's avatar
      myrg_rrnd.c merge + insert OK · 1ad29ca9
      unknown authored
      myrg_info.c	merge + insert OK
      mymrgdef.h	merge + insert OK
      mrg000001.test  test for the above
      mysql-test-run	compatibility (FreeBSD) changes from mysql-4.0 backpropagated
      
      
      mysql-test/mysql-test-run:
        compatibility (FreeBSD) changes from mysql-4.0 backpropagated
      myisammrg/mymrgdef.h:
        merge + insert OK
      myisammrg/myrg_info.c:
        merge + insert OK
      myisammrg/myrg_rrnd.c:
        merge + insert OK
      1ad29ca9
    • unknown's avatar
      manual.texi cleanups for recent change notes. · b0af1578
      unknown authored
      
      Docs/manual.texi:
        cleanups for recent change notes.
      b0af1578
    • unknown's avatar
      resolve merge problem · 51f6e175
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      51f6e175
    • unknown's avatar
      Merge jcole@work.mysql.com:/home/bk/mysql · 0a1fcefb
      unknown authored
      into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
      
      
      BitKeeper/etc/ignore:
        auto-union
      Docs/manual.texi:
        Auto merged
      0a1fcefb
    • unknown's avatar
      A few grammatical changes to manual.texi · 976ec82d
      unknown authored
      
      Docs/manual.texi:
        A few grammatical changes.
      976ec82d
  4. 05 Dec, 2000 8 commits
    • unknown's avatar
      Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql · e5c58586
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Auto converge
      Docs/manual.texi:
        Auto merged
      e5c58586
    • unknown's avatar
      Added innobase handler files + other updates for innobase · 7bdbe353
      unknown authored
      
      Docs/manual.texi:
        Changelog
      client/mysql.cc:
        Added optional argument to --i-am-a-dummy
      sql/handler.cc:
        Fix for innobase
      sql/handler.h:
        Fix for innobase
      sql/sql_class.cc:
        Fix for innobase
      sql/sql_db.cc:
        Fixed that DROP DATABASE works on OS/2
      7bdbe353
    • unknown's avatar
      Merge · 84eac0e7
      unknown authored
      
      Docs/manual.texi:
        merged
      84eac0e7
    • unknown's avatar
      Added innobase handler files · ca1c4706
      unknown authored
      Change that handler gets file names in native format
      
      
      Docs/manual.texi:
        Small bug fix
      sql/Makefile.am:
        Added innobase handler files
      sql/mysqld.cc:
        Added startup options for innobase
      sql/sql_table.cc:
        Change that handler gets file names in native format
      ca1c4706
    • unknown's avatar
      updated test case for SELECT DISTINCT coredump · 553011af
      unknown authored
      
      BitKeeper/etc/ignore:
        Added mysql-test/var/lib/mysql-bin.008 to the ignore list
      mysql-test/r/3.23/sel000100.result:
        coredump fixed, now it makes sense to have something in the result file
      mysql-test/t/3.23/sel000100.test:
        renamed result file
      553011af
    • unknown's avatar
      fixed typo in the manual · 3127a142
      unknown authored
      
      Docs/manual.texi:
        fixed typo
      mysql-test/chew_on_this/select.res:
        ***MISSING WEAVE***
      3127a142
    • unknown's avatar
      Merge work:/my/mysql into donna.mysql.com:/home/my/mysql-new · 6ffa1743
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      6ffa1743
    • unknown's avatar
      Fix for core dump in DISTINCT · d2b7b3be
      unknown authored
      
      Docs/manual.texi:
        Changlog
      mysql-test/chew_on_this/select.res:
        ***MISSING WEAVE***
      d2b7b3be