1. 20 May, 2001 13 commits
    • unknown's avatar
      configure.in openssl support · bd5b41c2
      unknown authored
      
      configure.in:
        openssl support
      bd5b41c2
    • unknown's avatar
      configure.in openssl support · ce4903cf
      unknown authored
      
      configure.in:
        openssl support
      ce4903cf
    • unknown's avatar
      acinclude.m4 openssl support · 21385ca4
      unknown authored
      
      acinclude.m4:
        openssl support
      21385ca4
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.0 · 369401d1
      unknown authored
      into x3.internalnet:/home/tonu/bk/mysql-4.0-modified
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/Makefile.am:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      369401d1
    • unknown's avatar
      mysqld.cc openssl support · 5bb27570
      unknown authored
      
      sql/mysqld.cc:
        openssl support
      5bb27570
    • unknown's avatar
      Makefile.am openssl support · 209e37a7
      unknown authored
      
      missing:
        openssl support
      sql/Makefile.am:
        openssl support
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      209e37a7
    • unknown's avatar
      .del-violite.c~984c09cffe14a11b Delete: libmysql/violite.c · 8b02ffba
      unknown authored
      acconfig.h	openssl support
      acinclude.m4	openssl support
      
      
      acinclude.m4:
        openssl support
      acconfig.h:
        openssl support
      BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
        Delete: libmysql/violite.c
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      8b02ffba
    • unknown's avatar
      Fixed that MySQL compiles again after last merge. · 8ec67661
      unknown authored
      
      myisam/myisamdef.h:
        Added missing declaration
      mysql-test/r/innodb.result:
        Changed test based on result from changed optimizer
      sql/mysql_priv.h:
        Fixed wrong prototype
      8ec67661
    • unknown's avatar
      viotcpip.c BitKeeper file /home/tonu/bk/mysql-4.0/vio/viotcpip.c · f70e8a23
      unknown authored
      viosslfactories.c	BitKeeper file /home/tonu/bk/mysql-4.0/vio/viosslfactories.c
      viossl.c	BitKeeper file /home/tonu/bk/mysql-4.0/vio/viossl.c
      vio.c   	BitKeeper file /home/tonu/bk/mysql-4.0/vio/vio.c
      
      
      f70e8a23
    • unknown's avatar
      .del-vio-global.h~c261412c01b2f4 Delete: vio/vio-global.h · 0fc76938
      unknown authored
      .del-viotypes.h~f5a38e7326bd50f3	Delete: vio/viotypes.h
      .del-violite.h~58d2942a52ea7a83	Delete: vio/violite.h
      .del-VioSSLFactoriesFd.h~1d63ae149a63f85	Delete: vio/VioSSLFactoriesFd.h
      .del-VioPipe.cc~12cf83b9a2f48f6c	Delete: vio/VioPipe.cc
      .del-VioSSLAcceptorFd.cc~4c828f3688ed74ec	Delete: vio/VioSSLAcceptorFd.cc
      .del-VioSSL.cc~6e85340b11fa42a8	Delete: vio/VioSSL.cc
      .del-VioSSLFactoriesFd.cc~89f6bf5073937947	Delete: vio/VioSSLFactoriesFd.cc
      .del-vioelitexx.cc~3eaba70da792a7fc	Delete: vio/vioelitexx.cc
      .del-version.cc~7237acf12bed4a97	Delete: vio/version.cc
      .del-VioSocket.cc~71c615783f29b5e1	Delete: vio/VioSocket.cc
      .del-VioSSL.h~70d367b7ec8cac3e	Delete: vio/VioSSL.h
      .del-VioPipe.h~21cebbe61a1da546	Delete: vio/VioPipe.h
      .del-VioFd.h~8294293a88c7b4b8	Delete: vio/VioFd.h
      .del-VioFd.cc~6e444647affef63b	Delete: vio/VioFd.cc
      .del-VioConnectorFd.h~58bc11cdc885b951	Delete: vio/VioConnectorFd.h
      .del-VioAcceptorFd.cc~a5a08947a31f88de	Delete: vio/VioAcceptorFd.cc
      .del-VioConnectorFd.cc~ddbd7821c43c83a2	Delete: vio/VioConnectorFd.cc
      .del-VioAcceptorFd.h~7f9c4358477ba9a3	Delete: vio/VioAcceptorFd.h
      .del-Vio.cc~60737ce02ab2bc25	Delete: vio/Vio.cc
      .del-Vio.h~f4416b2949647602	Delete: vio/Vio.h
      .del-VioSocket.h~a26d535bd5a1a6	Delete: vio/VioSocket.h
      
      
      BitKeeper/deleted/.del-VioSocket.h~a26d535bd5a1a6:
        Delete: vio/VioSocket.h
      BitKeeper/deleted/.del-Vio.cc~60737ce02ab2bc25:
        Delete: vio/Vio.cc
      BitKeeper/deleted/.del-Vio.h~f4416b2949647602:
        Delete: vio/Vio.h
      BitKeeper/deleted/.del-VioAcceptorFd.cc~a5a08947a31f88de:
        Delete: vio/VioAcceptorFd.cc
      BitKeeper/deleted/.del-VioAcceptorFd.h~7f9c4358477ba9a3:
        Delete: vio/VioAcceptorFd.h
      BitKeeper/deleted/.del-VioConnectorFd.cc~ddbd7821c43c83a2:
        Delete: vio/VioConnectorFd.cc
      BitKeeper/deleted/.del-VioConnectorFd.h~58bc11cdc885b951:
        Delete: vio/VioConnectorFd.h
      BitKeeper/deleted/.del-VioFd.cc~6e444647affef63b:
        Delete: vio/VioFd.cc
      BitKeeper/deleted/.del-VioFd.h~8294293a88c7b4b8:
        Delete: vio/VioFd.h
      BitKeeper/deleted/.del-VioPipe.h~21cebbe61a1da546:
        Delete: vio/VioPipe.h
      BitKeeper/deleted/.del-VioSSL.h~70d367b7ec8cac3e:
        Delete: vio/VioSSL.h
      BitKeeper/deleted/.del-VioSSLFactoriesFd.cc~89f6bf5073937947:
        Delete: vio/VioSSLFactoriesFd.cc
      BitKeeper/deleted/.del-VioSocket.cc~71c615783f29b5e1:
        Delete: vio/VioSocket.cc
      BitKeeper/deleted/.del-version.cc~7237acf12bed4a97:
        Delete: vio/version.cc
      BitKeeper/deleted/.del-vioelitexx.cc~3eaba70da792a7fc:
        Delete: vio/vioelitexx.cc
      BitKeeper/deleted/.del-VioPipe.cc~12cf83b9a2f48f6c:
        Delete: vio/VioPipe.cc
      BitKeeper/deleted/.del-VioSSL.cc~6e85340b11fa42a8:
        Delete: vio/VioSSL.cc
      BitKeeper/deleted/.del-VioSSLAcceptorFd.cc~4c828f3688ed74ec:
        Delete: vio/VioSSLAcceptorFd.cc
      BitKeeper/deleted/.del-VioSSLFactoriesFd.h~1d63ae149a63f85:
        Delete: vio/VioSSLFactoriesFd.h
      BitKeeper/deleted/.del-vio-global.h~c261412c01b2f4:
        Delete: vio/vio-global.h
      BitKeeper/deleted/.del-violite.h~58d2942a52ea7a83:
        Delete: vio/violite.h
      BitKeeper/deleted/.del-viotypes.h~f5a38e7326bd50f3:
        Delete: vio/viotypes.h
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      0fc76938
    • unknown's avatar
      new qsort · 7abb78bc
      unknown authored
      
      mysys/mf_qsort.c:
        New sort
      7abb78bc
    • unknown's avatar
      New qsort implementation · 4698fbee
      unknown authored
      
      sql/sql_handler.cc:
        Fixed insert_fields usage
      4698fbee
    • unknown's avatar
      merge · 17fbf163
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysql.cc:
        Auto merged
      myisam/mi_search.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      17fbf163
  2. 19 May, 2001 3 commits
    • unknown's avatar
      merge · 112ad672
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      112ad672
    • unknown's avatar
      Force close of sockets on HPUX 10.20 · ee896803
      unknown authored
      Support option lines longer than 256 chars.
      Close the slow log at shutdown.
      Always allow debug options to mysqld.
      Change some DBUG_PRINT tags.
      
      
      Docs/manual.texi:
        Small cleanups
      configure.in:
        Force close of sockets on HPUX 10.20
      mysql-test/t/merge.test:
        Remove used tables
      mysys/default.c:
        Support option lines longer than 256 chars.
      mysys/mf_keycache.c:
        Split check_keycache tags
      sql/mysqld.cc:
        Move things to 'cleanup'.
        Close the slow log at shutdown.
        Always allow debug options
      sql/violite.c:
        Change the error tag to vio_error
      ee896803
    • unknown's avatar
      manual.texi more development tree section changes · d20ee4bf
      unknown authored
      manual.texi	change "InnoDB consinsten read" to
      manual.texi	"InnoDB consistent read" in @node lines
      manual.texi	(to match section's actual title)
      manual.texi	cleanups to "installing from development source
      manual.texi	tree" section
      
      
      Docs/manual.texi:
        more development tree section changes
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      d20ee4bf
  3. 18 May, 2001 6 commits
    • unknown's avatar
      ibuf0ibuf.c Insert buffer calculated SQL NULL size wrong, causing overflow and... · f194e4e0
      unknown authored
      ibuf0ibuf.c	Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
      log0log.c	Retrieve a dummy value from a function to prevent gcc crashing on HP-UX
      
      
      innobase/log/log0log.c:
        Retrieve a dummy value from a function to prevent gcc crashing on HP-UX
      innobase/ibuf/ibuf0ibuf.c:
        Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      f194e4e0
    • unknown's avatar
      Merge · 62198cbc
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      62198cbc
    • unknown's avatar
      Do-patch-file Fix typo (extra 'mv') · ada14881
      unknown authored
      ignore  	added Logs/* binary/*
      
      
      BitKeeper/etc/ignore:
        added Logs/* binary/*
      Build-tools/Do-patch-file:
        Fix typo (extra 'mv')
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      ada14881
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · 93eefe46
      unknown authored
      into threads.polyesthetic.msg:/usr/local/src/my/3
      
      
      Docs/manual.texi:
        Auto merged
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      93eefe46
    • unknown's avatar
      manual.texi @[XXX] -> @{[XXX]} (syntax error) · eb6011f9
      unknown authored
      
      Docs/manual.texi:
        @[XXX] -> @{[XXX]} (syntax error)
      eb6011f9
    • unknown's avatar
      Clean out some more generated files from the bdb tree. Add a hack · d7eb456a
      unknown authored
      to bdb/dist/s_rpc so that bk doesn't complain about the
      rpc_server/db_server_proc.c file that gets overwritten (but needs to
      be stored in BK).  Add a bdb/dist/template directory which is needed
      by bdb/dist/s_recover.
      
      
      BitKeeper/deleted/.del-gen_client_ext.h~5c621cacb18b38:
        Delete: bdb/include/gen_client_ext.h
      BitKeeper/deleted/.del-gen_client_ret~786a5e65119b3991:
        Delete: bdb/dist/template/gen_client_ret
      BitKeeper/deleted/.del-db_server.x~811aeb6b630fe7aa:
        Delete: bdb/rpc_server/db_server.x
      BitKeeper/deleted/.del-db_server_proc.sed~1a9af8e5b051acbd:
        Delete: bdb/rpc_server/db_server_proc.sed
      BitKeeper/deleted/.del-db_server_proc~2e8b49d42aefab55:
        Delete: bdb/dist/template/db_server_proc
      BitKeeper/deleted/.del-gen_server_ext.h~fd7bcfe6bbca8bcb:
        Delete: bdb/include/gen_server_ext.h
      BitKeeper/deleted/.del-db_archive.dsp~e3da826e91bb086:
        Delete: bdb/build_win32/db_archive.dsp
      BitKeeper/deleted/.del-db_checkpoint.dsp~8071af22db95b1db:
        Delete: bdb/build_win32/db_checkpoint.dsp
      BitKeeper/deleted/.del-db_deadlock.dsp~befd45d29eaeb672:
        Delete: bdb/build_win32/db_deadlock.dsp
      BitKeeper/deleted/.del-db_dll.dsp~4e9dda53c84511b6:
        Delete: bdb/build_win32/db_dll.dsp
      BitKeeper/deleted/.del-db_dump.dsp~e07d2a82708b61:
        Delete: bdb/build_win32/db_dump.dsp
      BitKeeper/deleted/.del-db_java.dsp~e3941d5a9810b360:
        Delete: bdb/build_win32/db_java.dsp
      BitKeeper/deleted/.del-db_load.dsp~e83a2af8e24a715d:
        Delete: bdb/build_win32/db_load.dsp
      BitKeeper/deleted/.del-db_printlog.dsp~163f6e1073a5f396:
        Delete: bdb/build_win32/db_printlog.dsp
      BitKeeper/deleted/.del-db_recover.dsp~835c32ab73359256:
        Delete: bdb/build_win32/db_recover.dsp
      BitKeeper/deleted/.del-db_stat.dsp~f77417f5d9984986:
        Delete: bdb/build_win32/db_stat.dsp
      BitKeeper/deleted/.del-db_static.dsp~78ea414467defc70:
        Delete: bdb/build_win32/db_static.dsp
      BitKeeper/deleted/.del-db_tcl.dsp~5ad951d774e41520:
        Delete: bdb/build_win32/db_tcl.dsp
      BitKeeper/deleted/.del-db_upgrade.dsp~90fd250190af4984:
        Delete: bdb/build_win32/db_upgrade.dsp
      BitKeeper/deleted/.del-db_verify.dsp~e9a4938542f86cea:
        Delete: bdb/build_win32/db_verify.dsp
      BitKeeper/deleted/.del-ex_access.dsp~8dd6017efffae14e:
        Delete: bdb/build_win32/ex_access.dsp
      BitKeeper/deleted/.del-ex_btrec.dsp~c87137287d8d67dc:
        Delete: bdb/build_win32/ex_btrec.dsp
      BitKeeper/deleted/.del-ex_env.dsp~1732d5e41efda77:
        Delete: bdb/build_win32/ex_env.dsp
      BitKeeper/deleted/.del-ex_lock.dsp~286d2566e786dde:
        Delete: bdb/build_win32/ex_lock.dsp
      BitKeeper/deleted/.del-ex_mpool.dsp~9eb937bc70c1573:
        Delete: bdb/build_win32/ex_mpool.dsp
      BitKeeper/deleted/.del-ex_tpcb.dsp~644b38dae8b38152:
        Delete: bdb/build_win32/ex_tpcb.dsp
      BitKeeper/deleted/.del-excxx_access.dsp~31e87b6228470681:
        Delete: bdb/build_win32/excxx_access.dsp
      BitKeeper/deleted/.del-excxx_btrec.dsp~61b563f4ac1f73eb:
        Delete: bdb/build_win32/excxx_btrec.dsp
      BitKeeper/deleted/.del-excxx_env.dsp~b0bf2649a4c797ac:
        Delete: bdb/build_win32/excxx_env.dsp
      BitKeeper/deleted/.del-excxx_lock.dsp~257abf03544f6270:
        Delete: bdb/build_win32/excxx_lock.dsp
      BitKeeper/deleted/.del-excxx_mpool.dsp~d17a5d09f09f5217:
        Delete: bdb/build_win32/excxx_mpool.dsp
      BitKeeper/deleted/.del-excxx_tpcb.dsp~159c727e2c15105e:
        Delete: bdb/build_win32/excxx_tpcb.dsp
      BitKeeper/deleted/.del-logtrack.list~7f4f1382b37d98e5:
        Delete: bdb/test/logtrack.list
      BitKeeper/etc/ignore:
        added bdb/build_win32/db_archive.dsp bdb/build_win32/db_checkpoint.dsp bdb/build_win32/db_deadlock.dsp bdb/build_win32/db_dump.dsp bdb/build_win32/db_load.dsp bdb/build_win32/db_printlog.dsp bdb/build_win32/db_recover.dsp bdb/build_win32/db_stat.dsp bdb/build_win32/db_upgrade.dsp bdb/build_win32/db_verify.dsp bdb/build_win32/ex_access.dsp bdb/build_win32/ex_btrec.dsp bdb/build_win32/ex_env.dsp bdb/build_win32/ex_lock.dsp bdb/build_win32/ex_mpool.dsp bdb/build_win32/ex_tpcb.dsp bdb/build_win32/excxx_access.dsp bdb/build_win32/excxx_btrec.dsp bdb/build_win32/excxx_env.dsp bdb/build_win32/excxx_lock.dsp bdb/build_win32/excxx_mpool.dsp bdb/build_win32/excxx_tpcb.dsp bdb/build_win32/db_dll.dsp bdb/build_win32/db_java.dsp bdb/build_win32/db_static.dsp bdb/build_win32/db_tcl.dsp bdb/dist/template/gen_client_ret bdb/dist/template/db_server_proc bdb/include/gen_client_ext.h bdb/include/gen_server_ext.h bdb/rpc_server/db_server_proc.sed bdb/rpc_server/db_server.x bdb/test/logtrack.list
      bdb/dist/s_rpc:
        This is a hack to handle the $proc_file special case.  Since it
        is both a source file and a generated file, we have to dance a
        bit to get it to work with 'bk get', not just with 'bk edit'.
        This still isn't perfect (I don't know what perfect would be in
        this case), but it seems to work for now.
      d7eb456a
  4. 17 May, 2001 1 commit
  5. 16 May, 2001 8 commits
    • unknown's avatar
      Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql · 5ee5f0db
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      5ee5f0db
    • unknown's avatar
      Fixed bug when using MERGE on files > 4G · ebe9b607
      unknown authored
      Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
      Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
      Changed that tmp_table_size =4G-1 means unlimited.
      
      
      Docs/manual.texi:
        Added new section about crashed MyISAM tables.
        Cleaned up subsections for InnoDB
      client/mysql.cc:
        Cleanup
      myisam/mi_rkey.c:
        Cleanup
      myisam/mi_search.c:
        Fixed wrong casts in debug messages
      myisammrg/myrg_rrnd.c:
        Fixed bug when using files > 4G
      mysys/getvar.c:
        Changed to use longlong to support arguments up to 4G
      mysys/thr_lock.c:
        Fix for delay insert
      sql/mysqld.cc:
        Increased default size for temporary tables
      sql/sql_base.cc:
        Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
      sql/sql_insert.cc:
        Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
      sql/sql_select.cc:
        Changed that tmp_table_size =4G-1 means unlimited.
      ebe9b607
    • unknown's avatar
      merged · e40f0f1c
      unknown authored
      e40f0f1c
    • unknown's avatar
      Fulltext manual changed, MERGE bug fixed · 89ec1da4
      unknown authored
      
      Docs/manual.texi:
        Fulltext manual changed, MERGE bug added to changelog
      myisammrg/mymrgdef.h:
        MERGE bug fixed
      myisammrg/myrg_rkey.c:
        MERGE bug fixed
      myisammrg/myrg_rnext.c:
        MERGE bug fixed
      myisammrg/myrg_rprev.c:
        MERGE bug fixed
      mysql-test/r/merge.result:
        MERGE bug fixed
      mysql-test/t/merge.test:
        MERGE bug fixed
      89ec1da4
    • unknown's avatar
      Merge work:/home/bk/mysql · 8aeba900
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      8aeba900
    • unknown's avatar
      mysql-test/r/rpl000001.result · fa33f498
      unknown authored
          forgot to add result
      
      
      mysql-test/r/rpl000001.result:
        forgot to add result
      fa33f498
    • unknown's avatar
      mysql-test/t/rpl000001.test · 1f998add
      unknown authored
          added a test for updates on user table
      
      
      mysql-test/t/rpl000001.test:
        added a test for updates on user table
      1f998add
    • unknown's avatar
      os0file.c Fixed an extraneous error message at the start of db, changed from... · 8dada463
      unknown authored
      os0file.c	Fixed an extraneous error message at the start of db, changed from O_SYNC back to fdatasync because extremely slow on Sun
      
      
      innobase/os/os0file.c:
        Fixed an extraneous error message at the start of db, changed from O_SYNC back to fdatasync because extremely slow on Sun
      8dada463
  6. 15 May, 2001 5 commits
  7. 14 May, 2001 4 commits