1. 10 Oct, 2001 7 commits
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 9d0b8dcd
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      9d0b8dcd
    • unknown's avatar
      got the last changeset to compile/run · b65ec015
      unknown authored
      mysqltest can run without connecting to the manager for tests that do not 
      require manager operations
      
      
      client/mysqltest.c:
        make mysqltest work without having to connect to the manager
      mysql-test/mysql-test-run.sh:
        init-rpl-role option to servers
        pass manager-host to mysqltest
      mysql-test/r/rpl_failsafe.result:
        updated result
      mysql-test/t/rpl_failsafe.test:
        check for Rpl_status
      sql/mysqld.cc:
        fixed bad merge
      sql/repl_failsafe.cc:
        fixed bug
      sql/repl_failsafe.h:
        fixed compile error
      sql/sql_show.cc:
        fixed compile error
      b65ec015
    • unknown's avatar
      Always build thread safe client libraries in the distributed build · 2d0fb7e2
      unknown authored
      Add mysqlmanager to binary distribution.
      
      
      Build-tools/Do-compile:
        Always build thread safe client libraries.
      Docs/manual.texi:
        More info about SET
      client/mysqldump.c:
        Cleanup
      scripts/make_binary_distribution.sh:
        Add mysqlmanager
      support-files/mysql.spec.sh:
        Added mysqlmanager to RPM
      2d0fb7e2
    • unknown's avatar
      Fixes to get RPM done · ab757a56
      unknown authored
      
      Docs/manual.texi:
        Updated Changelog
      ab757a56
    • unknown's avatar
      mysql.spec.sh fix typo · 3f3111d0
      unknown authored
      
      support-files/mysql.spec.sh:
        fix typo
      3f3111d0
    • unknown's avatar
      merged · f822414b
      unknown authored
      
      sql/Makefile.am:
        Auto merged
      f822414b
    • unknown's avatar
      Added rpl_status. This is a midway commit to be able to pull so I can save · b5bc50e1
      unknown authored
      myself a run of compile-pentium-debug. I have not even tried to compile the 
      new code
      
      
      sql/Makefile.am:
        added repl_failsafe.*
      sql/mysqld.cc:
        added Rpl_status
      sql/sql_show.cc:
        added rpl_status
      sql/structs.h:
        rpl_status
      b5bc50e1
  2. 09 Oct, 2001 12 commits
    • unknown's avatar
      merge · 1fb6aa05
      unknown authored
      
      acinclude.m4:
        Auto merged
      Build-tools/Do-rpm:
        Auto merged
      sql/Makefile.am:
        Auto merged
      1fb6aa05
    • unknown's avatar
      Remved Gemini code. · d813d8ad
      unknown authored
      
      BitKeeper/deleted/.del-ha_gemini.cc~5d72172d33b00c6:
        Delete: sql/ha_gemini.cc
      BitKeeper/deleted/.del-ha_gemini.h~4dfccf1929195747:
        Delete: sql/ha_gemini.h
      BitKeeper/deleted/.del-gemini.result~89b4f9cced8dfc2f:
        Delete: mysql-test/r/gemini.result
      BitKeeper/deleted/.del-gemini.test~51d0362310e55e17:
        Delete: mysql-test/t/gemini.test
      BitKeeper/deleted/.del-have_gemini.inc~42f94f0dfd0f7b18:
        Delete: mysql-test/include/have_gemini.inc
      BitKeeper/deleted/.del-have_gemini.require~206702c48b2e206b:
        Delete: mysql-test/r/have_gemini.require
      BitKeeper/deleted/.del-gemini.dat~a73393a88b124b9f:
        Delete: mysql-test/std_data/gemini.dat
      BitKeeper/deleted/.del-isolation.test~6a39e4138dd4a456:
        Delete: mysql-test/t/isolation.test
      BitKeeper/deleted/.del-isolation.result~4da11e109a3d93a9:
        Delete: mysql-test/r/isolation.result
      acinclude.m4:
        Remved gemini code.
      configure.in:
        Remved gemini code.
      libmysql/libmysql.c:
        Remved gemini code.
      mysql-test/install_test_db.sh:
        Remved gemini code.
      scripts/mysql_install_db.sh:
        Remved gemini code.
      sql/Makefile.am:
        Remved gemini code.
      sql/field.cc:
        Remved gemini code.
      sql/field.h:
        Remved gemini code.
      sql/handler.cc:
        Remved gemini code.
      sql/handler.h:
        Remved gemini code.
      sql/lex.h:
        Remved gemini code.
      sql/mysqld.cc:
        Remved gemini code.
      sql/sql_base.cc:
        Remved gemini code.
      sql/sql_class.cc:
        Remved gemini code.
      sql/sql_class.h:
        Remved gemini code.
      sql/sql_lex.h:
        Remved gemini code.
      sql/sql_parse.cc:
        Remved gemini code.
      sql/sql_rename.cc:
        Remved gemini code.
      sql/sql_table.cc:
        Remved gemini code.
      sql/sql_yacc.yy:
        Remved gemini code.
      d813d8ad
    • unknown's avatar
      support for three slaves in mysql-test · 21e14c2c
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        start three slaves in failover test
      mysql-test/r/rpl_failsafe.result:
        check two more slaves
      mysql-test/t/rpl_failsafe.test:
        check two more slaves
      21e14c2c
    • unknown's avatar
      Portability & build fixes · 7eaf2749
      unknown authored
      
      Build-tools/Do-compile:
        Fix for new mysqlmanager
      Build-tools/Do-rpm:
        Make build safer
      Docs/manual.texi:
        Cleanup limitations section
      tools/mysqlmanager.c:
        Cleanup used include files
      7eaf2749
    • unknown's avatar
      Add --without-isam configure switch. · 9cf2870a
      unknown authored
      Portability fix for mysqlmanager.
      
      
      acconfig.h:
        Add HAVE_ISAM
      acinclude.m4:
        Add --without-isam configure switch.
      configure.in:
        Add --without-isam configure switch.
      include/my_global.h:
        remove #define HAVE_ISAM
      libmysqld/examples/test-run:
        pass --language option to embedded server
      sql/Makefile.am:
        use @isam_libs@ instead of hard-coded values
      tools/mysqlmanager.c:
        #include <signal.h> for portability
      9cf2870a
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.0 · 8b305acf
      unknown authored
      into work.mysql.com:/home/tim/my/4
      
      8b305acf
    • unknown's avatar
      Don't depend on mit-pthreads include files when building libmysqld.a · f0b97060
      unknown authored
      
      BUILD/compile-pentium-pgcc:
        Update to 4.0
      Docs/manual.texi:
        Added info about --with-embedded-server
      libmysqld/Makefile.am:
        Don't depend on mit-pthreads include files
      tools/mysqlmanager.c:
        Remove warnings
      f0b97060
    • unknown's avatar
      type fix · a2188fb2
      unknown authored
      
      vio/viossl.c:
        Don't blame me. Typo fix
      a2188fb2
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · 554e7f7f
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      mysql-test/r/drop.result:
        Auto merged
      mysql-test/r/err000001.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/overflow.result:
        Auto merged
      554e7f7f
    • unknown's avatar
      fixed error messages · f758ff1b
      unknown authored
      
      mysql-test/r/drop.result:
        error msg fix
      mysql-test/r/err000001.result:
        error msg fix
      mysql-test/r/innodb.result:
        error msg fix
      mysql-test/r/overflow.result:
        error msg fix
      f758ff1b
    • unknown's avatar
      mysql.spec.sh fix typo in embedded section · fc42cd39
      unknown authored
      Do-rpm  	remove the file before doing a cp
      Do-rpm  	print out the log file name
      
      
      Build-tools/Do-rpm:
        remove the file before doing a cp
        print out the log file name
      support-files/mysql.spec.sh:
        fix typo in embedded section
      fc42cd39
    • unknown's avatar
      One should not only have to include my_net.h to work with sockets. · 662cbc5d
      unknown authored
      This wrapper noew will include all the necessary, system specific files,
      which makes all normal source files much easier to write and maintain.
      Portability fixes.
      
      
      Docs/manual.texi:
        Updated upgrading from 3.23 -> 4.0
      client/mysqladmin.c:
        Portability fixes
      client/mysqlshow.c:
        Portability fixes
      extra/resolveip.c:
        Portability fixes
      include/my_global.h:
        Portability fixes
      include/my_net.h:
        One should not only have to include my_net.h to work with sockets.
        This wrapper noew will include all the necessary, system specific files,
        which makes all normal source files much easier to write and maintain.
      include/mysql_com.h:
        Portability fixes
      libmysql/net.c:
        Portability fixes
      libmysqld/lib_vio.c:
        Portability fixes
      mysql-test/r/drop.result:
        Fix crashed tests
      mysql-test/r/err000001.result:
        Fix crashed tests
      mysql-test/r/innodb.result:
        Fix crashed tests
      mysql-test/r/overflow.result:
        Fix crashed tests
      sql/net_serv.cc:
        Use new my_net.h
      vio/vio.c:
        Use new my_net.h
      vio/viosocket.c:
        Use new my_net.h
      vio/viossl.c:
        Use new my_net.h
      662cbc5d
  3. 08 Oct, 2001 7 commits
    • unknown's avatar
      Portability fixes + a couple of bug fixes introduced by last push. · d378b1e3
      unknown authored
      
      Docs/manual.texi:
        Removed wrong web links
      include/mysql_com.h:
        Portability fix
      libmysqld/Makefile.am:
        Fix 'make dist'
      mysys/mf_dirname.c:
        Bugfix for last push
      scripts/explain_log.sh:
        Nicer output
      scripts/mysql_install_db.sh:
        Removed warnings when using 'mysql_install_db'
      sql/sql_parse.cc:
        Ensure that thd->query_length is always set
      sql/sql_show.cc:
        cleanup
      sql/sql_yacc.yy:
        Fix bug in last push
      vio/vio.c:
        Merge with violite.cc
      vio/viosocket.c:
        Merge with violite.cc
      d378b1e3
    • unknown's avatar
      Merge work:/home/bk/mysql-4.0 · aff99184
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      aff99184
    • unknown's avatar
      groundbreaking on fail-safe replication - added a token feature to have an · 0b2ef577
      unknown authored
      excuse to have a test case. Mental trick to get things moving faster...
      
      
      mysql-test/mysql-test-run.sh:
        recovery rank
      sql/mysqld.cc:
        recovery rank
      0b2ef577
    • unknown's avatar
      Portability fix · 695b9bf7
      unknown authored
      695b9bf7
    • unknown's avatar
      Cleanup after last merge · d7307e1a
      unknown authored
      
      client/mysqltest.c:
        Don't write error message to log if there is more than one possible error message
      include/mysqld_error.h:
        Made error messages more general
      libmysqld/Makefile.am:
        md5 is now in mysys
      mysql-test/include/have_isam.inc:
        Update to new result format
      mysql-test/include/not_embedded.inc:
        Update to new result format
      mysql-test/mysql-test-run.sh:
        Update to new result format
      mysql-test/r/auto_increment.result:
        Update to new result format
      mysql-test/r/count_distinct2.result:
        Update to new result format
      mysql-test/r/create.result:
        Update to new result format
      mysql-test/r/func_system.result:
        Update to new result format
      mysql-test/r/isam.result:
        Update to new result format
      mysql-test/r/lock.result:
        Update to new result format
      mysql-test/r/lock_multi.result:
        Update to new result format
      mysql-test/r/rename.result:
        Update to new result format
      mysql-test/r/rpl000001.result:
        Fix wrong test
      mysql-test/r/tablelock.result:
        Update to new result format
      mysql-test/t/rename.test:
        Update to new result format
      sql/share/czech/errmsg.txt:
        Made error messages more general
      sql/share/danish/errmsg.txt:
        Made error messages more general
      sql/share/dutch/errmsg.txt:
        Made error messages more general
      sql/share/english/errmsg.txt:
        Made error messages more general
      sql/share/estonian/errmsg.txt:
        Made error messages more general
      sql/share/french/errmsg.txt:
        Made error messages more general
      sql/share/german/errmsg.txt:
        Made error messages more general
      sql/share/greek/errmsg.txt:
        Made error messages more general
      sql/share/hungarian/errmsg.txt:
        Made error messages more general
      sql/share/italian/errmsg.txt:
        Made error messages more general
      sql/share/japanese/errmsg.txt:
        Made error messages more general
      sql/share/korean/errmsg.txt:
        Made error messages more general
      sql/share/norwegian-ny/errmsg.txt:
        Made error messages more general
      sql/share/norwegian/errmsg.txt:
        Made error messages more general
      sql/share/polish/errmsg.txt:
        Made error messages more general
      sql/share/portuguese/errmsg.txt:
        Made error messages more general
      sql/share/romanian/errmsg.txt:
        Made error messages more general
      sql/share/russian/errmsg.txt:
        Made error messages more general
      sql/share/slovak/errmsg.txt:
        Made error messages more general
      sql/share/spanish/errmsg.txt:
        Made error messages more general
      sql/share/swedish/errmsg.txt:
        Made error messages more general
      sql/share/ukrainian/errmsg.txt:
        Made error messages more general
      sql/sql_lex.cc:
        We can't remove lex->thd because sql_yacc uses it.
      sql/sql_lex.h:
        We can't remove lex->thd because sql_yacc uses it.
      sql/sql_yacc.yy:
        Cleanup
      support-files/mysql.spec.sh:
        Create MySQL-embedded rpm
      tools/mysqlmanager.c:
        Fix bug in merge
      d7307e1a
    • unknown's avatar
      merge · a914fff9
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      acinclude.m4:
        Auto merged
      Docs/manual.texi:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/mysql.h:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/t/count_distinct2.test:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/rpl000017.test:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysys/Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      libmysqld/Makefile.am:
        Added back md5.c
      a914fff9
    • unknown's avatar
      Updated manual about embedded version. · 6a8bf9ae
      unknown authored
      Speed up column-completion in 'mysql'
      Don't use ISAM if HAVE_ISAM is not defined
      A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
      Changed arguments to convert_dirname() to make it more general.
      Renamed files in the 'merge' directory to all use a common prefix.
      Don't compile both assembler and C functions on x86
      
      
      BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7:
        Delete: mysys/mf_pack2.c
      Docs/manual.texi:
        Updated chapter about embedded version
      acinclude.m4:
        Fix for using BDB and InnoDB with embedded
      client/completion_hash.cc:
        Speed up memory allocation
      client/completion_hash.h:
        Speed up memory allocation
      client/mysql.cc:
        Speed up memory allocation
      client/mysqldump.c:
        Fix to use now convert_dirname
      client/mysqltest.c:
        Fixed memory allocation bugs.
        Added --basedir=#, --compress=#, --server-arg, --server-file.
        Fixes for embedded version
        Changed silent mode to -s instead of -q
      include/my_global.h:
        Update to use HAVE_ISAM
      include/my_sys.h:
        Cleanup of fn_format()
      include/mysql.h:
        Prepare FIELD struct for 4.1
      include/mysql_embed.h:
        Don't use ISAM in embedded version
      innobase/include/srv0srv.h:
        Make InnoDB startup/shutdown silent in embedded version
      innobase/log/log0log.c:
        Make InnoDB startup/shutdown silent in embedded version
      innobase/srv/srv0srv.c:
        Make InnoDB startup/shutdown silent in embedded version
      innobase/srv/srv0start.c:
        Make InnoDB startup/shutdown silent in embedded version
      isam/isamlog.c:
        new convert_dirname
      libmysql/libmysql.c:
        Prepare for 4.1
      libmysqld/Makefile.am:
        Changed to create one libmysqld.a file that includes all other libraries.
      libmysqld/examples/Makefile.am:
        Changed to use new libmysqld.a
      libmysqld/examples/test-run:
        Lot's of fixes to get new mysqltest with embedded MySQL to work.
      libmysqld/lib_sql.cc:
        Changed type of arguments for mysql_server_init() to make code more portable.
      libmysqld/libmysqld.c:
        Cleanup
      merge/Makefile.am:
        Rename to use common prefix.
      merge/mrg_close.c:
        Rename to use common prefix.
      merge/mrg_create.c:
        Rename to use common prefix.
      merge/mrg_def.h:
        Rename to use common prefix.
      merge/mrg_delete.c:
        Rename to use common prefix.
      merge/mrg_extra.c:
        Rename to use common prefix.
      merge/mrg_info.c:
        Rename to use common prefix.
      merge/mrg_locking.c:
        Rename to use common prefix.
      merge/mrg_open.c:
        Rename to use common prefix.
      merge/mrg_panic.c:
        Rename to use common prefix.
      merge/mrg_rrnd.c:
        Rename to use common prefix.
      merge/mrg_rsame.c:
        Rename to use common prefix.
      merge/mrg_static.c:
        Rename to use common prefix.
      merge/mrg_update.c:
        Rename to use common prefix.
      myisam/myisamlog.c:
        Use new convert_dirname
      myisammrg/Makefile.am:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_close.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_create.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_def.h:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_delete.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_extra.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_info.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_locking.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_open.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_panic.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_queue.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_rfirst.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_rkey.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_rlast.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_rnext.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_rprev.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_rrnd.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_rsame.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_static.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_update.c:
        Renamed mymrgdef.h -> myrg_def.h
      myisammrg/myrg_write.c:
        Renamed mymrgdef.h -> myrg_def.h
      mysql-test/include/master-slave.inc:
        Use short filenames for sockets (portability problem on Mac OS X)
      mysql-test/mysql-test-run.sh:
        cleanup
      mysql-test/r/auto_increment.result:
        Cleanup of tests for embedded version
      mysql-test/r/func_system.result:
        Cleanup of tests for embedded version
      mysql-test/r/isam.result:
        Cleanup of tests for embedded version
      mysql-test/r/lock.result:
        Cleanup of tests for embedded version
      mysql-test/r/show_check.result:
        Cleanup of tests for embedded version
      mysql-test/t/auto_increment.test:
        Cleanup of tests for embedded version
      mysql-test/t/backup.test:
        Cleanup of tests for embedded version
      mysql-test/t/count_distinct2-master.opt:
        Cleanup of tests for embedded version
      mysql-test/t/count_distinct2.test:
        Cleanup of tests for embedded version
      mysql-test/t/create.test:
        Cleanup of tests for embedded version
      mysql-test/t/flush.test:
        Cleanup of tests for embedded version
      mysql-test/t/func_system.test:
        Cleanup of tests for embedded version
      mysql-test/t/isam.test:
        Cleanup of tests for embedded version
      mysql-test/t/kill.test:
        Cleanup of tests for embedded version
      mysql-test/t/lock.test:
        Cleanup of tests for embedded version
      mysql-test/t/order_fill_sortbuf-master.opt:
        Cleanup of tests for embedded version
      mysql-test/t/rpl000015.test:
        Use short filenames for sockets (portability problem on Mac OS X)
      mysql-test/t/rpl000016.test:
        Use short filenames for sockets (portability problem on Mac OS X)
      mysql-test/t/rpl000017.test:
        Use short filenames for sockets (portability problem on Mac OS X)
      mysql-test/t/rpl000018.test:
        Use short filenames for sockets (portability problem on Mac OS X)
      mysql-test/t/show_check.test:
        Move ISAM specific tests to isam.test
      mysql-test/t/status.test:
        Cleanup of tests for embedded version
      mysql-test/t/tablelock.test:
        Cleanup
      mysys/Makefile.am:
        Removed not used mf_pack2.c
      mysys/charset.c:
        new convert_dirname
      mysys/default.c:
        new convert_dirname
      mysys/mf_dirname.c:
        Changed convert_dirname() to be more general
      mysys/mf_format.c:
        Changed bit flags to fn_format() to defines.
        Added handling of relative filenames
      BitKeeper/etc/ignore:
        Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list
      mysys/mf_pack.c:
        new convert_dirname
      mysys/mf_tempfile.c:
        new convert_dirname
      scripts/Makefile.am:
        Adde mysql_explain_log
      scripts/mysql_config.sh:
        Added support of --libmysqld-libs
      sql/Makefile.am:
        Fix to use 'innodb_system_libs'
      sql/ha_innobase.cc:
        Make InnoDB startup/shutdown silent in embedded version
      sql/ha_isam.cc:
        Added handling of HAVE_ISAM
      sql/ha_isammrg.cc:
        Added handling of HAVE_ISAM
      sql/ha_myisam.cc:
        Handle relative paths;  Needed to support BACKUP TABLE in embedded version
      sql/ha_myisammrg.cc:
        Rename of filenames
      sql/handler.cc:
        Added handling of HAVE_ISAM
      sql/item_func.cc:
        Fix for ecc (Intel Compiler)
      sql/mysql_priv.h:
        Added global variable 'mysql_embedded'
      sql/mysqld.cc:
        Use HAVE_ISAM
      sql/sql_parse.cc:
        Use new convert_dirname
      sql/sql_select.cc:
        Fix for ecc (Intel Compiler)
      sql/sql_table.cc:
        Added handling of relative filenames
      strings/Makefile.am:
        Don't compile both assembler and C functions on x86
      strings/bchange.c:
        cleanup
      6a8bf9ae
  4. 07 Oct, 2001 3 commits
    • unknown's avatar
      Merge · 0794c317
      unknown authored
      
      BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
        Auto merged
      Docs/manual.texi:
        Auto merged
      client/mysqladmin.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_lex.cc:
        SCCS merged
      0794c317
    • unknown's avatar
      Fix for 'mysqladmin -w1 unknown-command' · ac57d641
      unknown authored
      Manual Changelog update
      
      
      Docs/manual.texi:
        Changelog
      client/mysqladmin.c:
        Fix for 'mysqladmin -w1 unknown-command'
      libmysql/violite.c:
        Fix for TCP_NODELAY
      mysql-test/mysql-test-run.sh:
        Portability fixes
      sql/sql_lex.cc:
        Cleanup
      sql/sql_lex.h:
        Cleanup
      ac57d641
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · 7207ea50
      unknown authored
      into work.mysql.com:/home/bk/mysql-4.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      mysql-test/t/rpl000017.test:
        Auto merged
      sql/slave.cc:
        Auto merged
      7207ea50
  5. 05 Oct, 2001 2 commits
    • unknown's avatar
      fixed crash on slave when master aborts a query that has % in it. · 22b44235
      unknown authored
      
      mysql-test/t/rpl000001.test:
        test for coredump on slave while trying to print aborted query
      sql/slave.cc:
        do not coredump printing aborted query if it has % in it.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      22b44235
    • unknown's avatar
      SSL fix · 16e722a4
      unknown authored
      
      acinclude.m4:
        When libssl.so was installed from RPM and libssl.a from source libssl.a detection worked properly. Fixed.
      16e722a4
  6. 04 Oct, 2001 7 commits
    • unknown's avatar
      fixed bug in SSL code · c0c55b43
      unknown authored
      updated results - now ready to push
      
      
      mysql-test/r/rpl000017.result:
        fix for new test format
      mysql-test/r/type_enum.result:
        updated result
      sql/mysqld.cc:
        fixed freeing NULL pointer
      c0c55b43
    • unknown's avatar
      Merge · d4cb107d
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      acinclude.m4:
        SCCS merged
      d4cb107d
    • unknown's avatar
      changes to make things work in the max version · 0636f110
      unknown authored
      
      acinclude.m4:
        automatically detect installation paths of OpenSSL instead of hard-coding
        automatically enable --with-vio if --with-openssl is enabled
      client/mysqltest.c:
        fixes for embedded library
      libmysqld/Makefile.am:
        md5 is now in mysys
      libmysqld/libmysqld.c:
        added my_connect(), but now can be removed - will do in the next
        changeset
      mysql-test/include/have_bdb.inc:
        disable query log so that result file will not have unneeded 
        show variables
      mysql-test/include/have_gemini.inc:
        disable query log so that result file will not have unneeded 
        show variables
      mysql-test/include/have_innodb.inc:
        disable query log so that result file will not have unneeded 
        show variables
      mysql-test/include/have_openssl.inc:
        disable query log so that result file will not have unneeded 
        show variables
      mysql-test/include/have_openssl_1.inc:
        disable query log so that result file will not have unneeded 
        show variables
      mysql-test/include/have_openssl_2.inc:
        disable query log so that result file will not have unneeded 
        show variables
      mysql-test/r/bdb.result:
        fix for new format
      mysql-test/r/have_openssl.require:
        ssl->openssl
      mysql-test/r/innodb.result:
        fix for query logging
      0636f110
    • unknown's avatar
      New script: explain_log.sh · 53c1dffb
      unknown authored
      Portability fixes.
      Handle cleanup when we get an error before the message file is read.
      Fix bug in multi-table delete
      
      
      include/mysql.h:
        Portability fix
      mysql-test/mysql-test-run.sh:
        Don't use long names for sockets (portability fix)
      sql/derror.cc:
        Better cleanup
      sql/mysqld.cc:
        Fix that --enable-locking works.
        Handle case when we get an error before the message file is read
      sql/sql_delete.cc:
        Fix bug in multi-table delete
      sql/sql_select.cc:
        Fix bug in multi-table delete
      sql/table.h:
        Fix bug in multi-table delete
      tools/mysqlmanager.c:
        Portability fixes
      53c1dffb
    • unknown's avatar
      Applied a patch for mysqldump · fd679ba7
      unknown authored
      
      client/mysqldump.c:
        Applied patch from Brian Aker. Changed rest of the '#' -comment
        marks to '--' for portability reasons.
      fd679ba7
    • unknown's avatar
      manual.texi change notes cleanup · 17e469b5
      unknown authored
      
      Docs/manual.texi:
        change notes cleanup
      17e469b5
    • unknown's avatar
      Fix mmanual nodes · 393f6a8d
      unknown authored
      
      Docs/manual.texi:
        Fix nodes
      393f6a8d
  7. 03 Oct, 2001 2 commits