1. 24 Dec, 2000 3 commits
    • unknown's avatar
      Fix duplicate symbol problem · 740f328e
      unknown authored
      740f328e
    • unknown's avatar
      merge · 967c1b04
      unknown authored
      
      configure.in:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      967c1b04
    • unknown's avatar
      New benchmark test · 78cf07c8
      unknown authored
      Fixed bug in REPLACE with BDB tables
      Prepare for write lock on read for BDB
      Inform the handler when we want to use IGNORE / REPLACE
      New manual pages
      
      
      Docs/manual.texi:
        Updates for BDB tables and new changes
      client/mysql.cc:
        Cleanup
      configure.in:
        Added sys/ioctl.h
      heap/hp_rkey.c:
        Fixed bug when reading next on not unique key
      include/my_base.h:
        Added new extra options
      man/mysql.1:
        Added example
      mysys/my_write.c:
        Safety fix
      scripts/mysqlaccess.sh:
        Removed debug output
      scripts/safe_mysqld.sh:
        Added --open-files-limit
      sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686:
        Updated to new benchmark
      sql-bench/bench-init.pl.sh:
        Updated to new benchmark
      sql-bench/server-cfg.sh:
        Fixes for HEAP tables
      sql-bench/test-ATIS.sh:
        Fix for heap tables
      sql-bench/test-insert.sh:
        Added some ORDER BY benchmarks to test more things
      sql/ha_berkeley.cc:
        Fix a bug in REPLACE
      sql/ha_berkeley.h:
        Fix to handle lock_on_read
      sql/mysql_priv.h:
        Prepare for internal subtransactions in BDB
      sql/mysqld.cc:
        Added -O open_files_limit=#
      sql/sql_insert.cc:
        Inform the handler when we want to use IGNORE / REPLACE
      sql/sql_load.cc:
        Inform the handler when we want to use IGNORE / REPLACE
      sql/sql_parse.cc:
        Cleanup
      sql/sql_show.cc:
        Cleanup
      sql/sql_table.cc:
        Inform the handler when we want to use IGNORE / REPLACE
      sql/sql_update.cc:
        Inform the handler when we want to use IGNORE / REPLACE
      support-files/binary-configure.sh:
        Better message
      78cf07c8
  2. 22 Dec, 2000 9 commits
  3. 21 Dec, 2000 4 commits
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · a09659dd
      unknown authored
      into cane.mysql.fi:/usr/home/tim/my/work
      
      
      acconfig.h:
        Auto merged
      configure.in:
        Auto merged
      a09659dd
    • unknown's avatar
      Test replace on all table types. · 9cecbe9b
      unknown authored
      Test delete from BDB table using hidden primary key.
      
      
      9cecbe9b
    • unknown's avatar
      Makefile bug fixes. · 97679a92
      unknown authored
      
      libmysql/Makefile.am:
        - Makefile.shared should be part of the distribution
      libmysql/Makefile.shared:
        - strto.lo should not be built
      97679a92
    • unknown's avatar
      Compatibility fix for BSDi. · 33cc250f
      unknown authored
      BSDi uses size_t * for the optlen arg to getsockopt, while other Unixes
      use socklen_t *.
      
      
      acconfig.h:
        - compatibility fix for BSDi (getsockopt optlen type)
      configure.in:
        - compatibility fix for BSDi (getsockopt optlen type)
      libmysql/libmysql.c:
        - compatibility fix for BSDi (getsockopt optlen type)
      sql/mini_client.cc:
        - compatibility fix for BSDi (getsockopt optlen type)
      33cc250f
  4. 20 Dec, 2000 9 commits
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · a9db7b74
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      a9db7b74
    • unknown's avatar
      fixed up rpl000014 · 3f1a5f8b
      unknown authored
      undid bug in ENCRYPT() - will push this now
      added a test case for ENCRYPT()
      
      
      mysql-test/r/rpl000014.result:
        fixed result
      mysql-test/t/rpl000014.test:
        fixed timing ambiguity
      sql/item_strfunc.cc:
        undid SEGV bug in ENCRYPT()
      3f1a5f8b
    • unknown's avatar
      Merge · cc316ee1
      unknown authored
      cc316ee1
    • unknown's avatar
      mysql-test-run.sh expr substr -> echo | cut · f2abb743
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        expr substr -> echo | cut
      f2abb743
    • unknown's avatar
      sql_select.cc Disables quick_select for JT_FT · 9622ae14
      unknown authored
      filesort.cc	Temporary fix for FULLTEXT index removed
      
      
      sql/filesort.cc:
        Temporary fix for FULLTEXT index removed
      sql/sql_select.cc:
        Disables quick_select for JT_FT
      9622ae14
    • unknown's avatar
      423448e2
    • unknown's avatar
      acconfig.h · 33ae3217
      unknown authored
          fix to make ENCRYPT work
      BUILD/compile-pentium-debug
          debug has different warnings
      BUILD/FINISH.sh
          save symbol table and dissassembled code with symobls available before strip
          use $do_make for make decision instead of $make to avoid conflict
      BUILD/SETUP.sh
          export AM_MAKEFLAGS
          fast is now -fno-omit-frame-pointer, the opposite is now called 
          reckless
      configure.in
          fixes to make CRYPT work again
      Docs/Makefile.am
          hack to avoid rebuilding the manual on make clean -why does
          Makefile depend on $BUILD_SOURCES, and do we even need BUILD_SOURCES?
      
      
      BUILD/FINISH.sh:
        save symbol table and dissassembled code with symobls available before strip
        use $do_make for make decision instead of $make to avoid conflict
      BUILD/SETUP.sh:
        export AM_MAKEFLAGS
        fast is now -fno-omit-frame-pointer, the opposite is now called 
        reckless
      BUILD/compile-pentium-debug:
        debug has different warnings
      BitKeeper/etc/ignore:
        Added mysqld.S mysqld.sym to the ignore list
      Docs/Makefile.am:
        hack to avoid rebuilding the manual on make clean -why does
        Makefile depend on $BUILD_SOURCES, and do we even need BUILD_SOURCES?
      acconfig.h:
        fix to make ENCRYPT work
      configure.in:
        fixes to make CRYPT work again
      33ae3217
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · d029966f
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      sql/mysqld.cc:
        Auto merged
      d029966f
    • unknown's avatar
      sql/mysqld.cc · 8310a70c
      unknown authored
          small fixes in backtrace code
      
      
      sql/mysqld.cc:
        small fixes in backtrace code
      8310a70c
  5. 19 Dec, 2000 1 commit
  6. 18 Dec, 2000 12 commits
    • unknown's avatar
      Pass arguements to the build script on to configure. · 27336dfe
      unknown authored
      
      BUILD/FINISH.sh:
        - pass arguments to the build script on to configure
      27336dfe
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql · 05cc1ba2
      unknown authored
      into cane.mysql.fi:/usr/home/tim/my/work
      
      
      Docs/manual.texi:
        Auto merged
      05cc1ba2
    • unknown's avatar
      Merge · 82b9e4e7
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      BUILD/compile-pentium:
        SCCS merged
      82b9e4e7
    • unknown's avatar
      erge with 4.0 + updates for column types · b23a560f
      unknown authored
      
      sql-bench/copy-db.sh:
        Change mode to -rw-rw-r--
      sql-bench/crash-me.sh:
        Change mode to -rw-rw-r--
      sql-bench/server-cfg.sh:
        Change mode to -rw-rw-r--
      sql-bench/test-insert.sh:
        Change mode to -rw-rw-r--
      Docs/manual.texi:
        Merge with 4.0 + updates for column types
      sql/mysqld.cc:
        cleanup
      b23a560f
    • unknown's avatar
      Ignore Berkeley DB directory. · 08d8d2ad
      unknown authored
      
      BitKeeper/etc/ignore:
        - ignore Berkeley DB directory
      08d8d2ad
    • unknown's avatar
      - cleaned up BUILD scripts · 447b5534
      unknown authored
          - consolidate common functionality into one place
          - make them detect gmake/make
      
      
      BUILD/compile-alpha:
        - cleaned up BUILD scripts
        - consolidate common functionality into one place
        - make them detect gmake/make
      BUILD/compile-pentium-debug-no-bdb:
        - cleaned up BUILD scripts
        - consolidate common functionality into one place
        - make them detect gmake/make
      BUILD/compile-pentium-debug:
        - cleaned up BUILD scripts
        - consolidate common functionality into one place
        - make them detect gmake/make
      BUILD/compile-pentium-gcov:
        - cleaned up BUILD scripts
        - consolidate common functionality into one place
        - make them detect gmake/make
      BUILD/compile-pentium-myodbc:
        - cleaned up BUILD scripts
        - consolidate common functionality into one place
        - make them detect gmake/make
      BUILD/compile-pentium:
        - cleaned up BUILD scripts
        - consolidate common functionality into one place
        - make them detect gmake/make
      BUILD/compile-solaris-sparc-purify:
        - cleaned up BUILD scripts
        - consolidate common functionality into one place
        - make them detect gmake/make
      BUILD/compile-solaris-sparc:
        - cleaned up BUILD scripts
        - consolidate common functionality into one place
        - make them detect gmake/make
      447b5534
    • unknown's avatar
      Added SHOW OPEN TABLES. Thanks to Antony T Curtis <antony@abacus.co.uk> · 7cdb2b2d
      unknown authored
      for the code.
      
      
      Docs/manual.texi:
        - added SHOW OPEN TABLES
      sql/gen_lex_hash.cc:
        - added SHOW OPEN TABLES
      sql/lex.h:
        - added SHOW OPEN TABLES
      sql/mysql_priv.h:
        - added SHOW OPEN TABLES
      sql/sql_base.cc:
        - added SHOW OPEN TABLES
      sql/sql_lex.h:
        - added SHOW OPEN TABLES
      sql/sql_parse.cc:
        - added SHOW OPEN TABLES
      sql/sql_show.cc:
        - added SHOW OPEN TABLES
      sql/sql_yacc.yy:
        - added SHOW OPEN TABLES
      7cdb2b2d
    • unknown's avatar
      fixed logging bug in generate_table() · b61940f5
      unknown authored
      added message on all segfaults, and numeric backtrace of Linux i386
      introduced a bug into ENCRYPT() to test backtrace - will clean up
      before push, but need this commit locally to pull on slave repositories
      to do further testing
      
      
      sql/item_strfunc.cc:
        temporarily introduced coredump bug into encrypt -- will not push,
        don't worry, just need to commit locally to test if my backtrace
        magic works on non-debugging binaries
      sql/mysqld.cc:
        changed SIGSEGV handler to execute on all platforms. write_core()
        invoked only if you do --core-file, but a message is printed regardless
        On i386 Linux, attempt a numeric backtrace
      sql/sql_delete.cc:
        Fixed logging bug - must log before send_ok(), otherwise, we may mess
        up error code in the query event if send_ok() fails.
      b61940f5
    • unknown's avatar
      Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql · 791d4ea0
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      BitKeeper/etc/gone:
        auto-union
      791d4ea0
    • unknown's avatar
    • unknown's avatar
      5cec43b7
    • unknown's avatar
      Lots of new benchmark runs · 374cc051
      unknown authored
      Remember filename for temporary files created with mkstemp
      Fixed wrongly allocated BDB share structure
      Cleanups for SunPRO
      
      
      BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.6_sun4m~62028e0375b3b8b:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-RUN-mysql-SunOS_5.6_sun4m~eafc8188345e262b:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.6_sun4m~8a1bd6589a189890:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.6_sun4m~f351a7f3e1e2257e:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-connect-mysql-SunOS_5.6_sun4m~a10e3ddfa26a3e7f:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-create-mysql-SunOS_5.6_sun4m~9233114ae6f8c5f:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-insert-mysql-SunOS_5.6_sun4m~3402d060ae20e19:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-select-mysql-SunOS_5.6_sun4m~4da215905bce988d:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.6_sun4m~ec61b14072715dc8:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.12_20smp_i686~28211fb9f0e6ab0e:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.12_20smp_i686~da28ced3e0aac09c:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.12_20smp_i686~67ae4e91b5f4eabd:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.12_20smp_i686~a2dcb74a3c73ac18:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-connect-mysql-Linux_2.2.12_20smp_i686~beedcd769a903c19:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-create-mysql-Linux_2.2.12_20smp_i686~fe23ee50aea195f4:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-insert-mysql-Linux_2.2.12_20smp_i686~f120b0ead3836c81:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-select-mysql-Linux_2.2.12_20smp_i686~3b64aff0dfddfff4:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.12_20smp_i686~d49db545341a732f:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.13_SMP_alpha~136bdd9fd1a2cd14:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.13_SMP_alpha~defb62af5958fcac:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.13_SMP_alpha~f6fa9f46d4a6152:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.13_SMP_alpha~16694c5927b7600c:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.13_SMP_alpha~c85eb85ba45dd748:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.13_SMP_alpha~b062db76cf6df5d2:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.13_SMP_alpha~b5f4f4c35225f0f:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.13_SMP_alpha~a9eedd951eab7e8b:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-connect-mysql-Linux_2.2.13_SMP_alpha~74ec2bf5f55b81f:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.13_SMP_alpha~f6d7665c418d62c6:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-create-mysql-Linux_2.2.13_SMP_alpha~771b40d3280fe8ad:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.13_SMP_alpha~c46d6c283c0e34ae:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-insert-mysql-Linux_2.2.13_SMP_alpha~17f262f12d2244bc:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.13_SMP_alpha~3245ba5633a18e8:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-select-mysql-Linux_2.2.13_SMP_alpha~9fd9c6e036f988d7:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.13_SMP_alpha~744633c6e13a897f:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.13_SMP_alpha~ad7babd436f26841:
        ***MISSING WEAVE***
      BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.13_SMP_alpha~6ad065fe4c6b4fa9:
        ***MISSING WEAVE***
      BUILD/compile-pentium:
        Added command line arguments
      Docs/manual.texi:
        Update for 3.23.30
      configure.in:
        Removed duplicated symbol
      include/my_sys.h:
        cleanup of my_open/my_create/my_tempfile
      mysys/mf_tempfile.c:
        Remember filename for temporary files created with mkstemp
      mysys/my_create.c:
        cleanup of my_open/my_create/my_tempfile
      mysys/my_open.c:
        cleanup of my_open/my_create/my_tempfile
      scripts/mysqld_multi.sh:
        Use paths from configure
      scripts/safe_mysqld.sh:
        Cleanup
      sql-bench/Results/ATIS-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql-bench/Results/alter-table-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql-bench/Results/big-tables-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql-bench/Results/connect-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql-bench/Results/create-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql-bench/Results/insert-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql-bench/Results/select-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql-bench/Results/wisconsin-mysql-SunOS_5.7_sun4m:
        New benchmark results
      sql/ha_berkeley.cc:
        Fixed wrongly allocated share structure
      sql/item_cmpfunc.cc:
        Cleanup
      sql/item_cmpfunc.h:
        Cleanup
      sql/log_event.h:
        Cleanup
      sql/mysqld.cc:
        Changed default number of BDB locks to 10000
      sql/sql_class.h:
        cleanup
      sql/sql_show.cc:
        cleanup
      support-files/mysql.spec.sh:
        Added mysqld_multi
      sql-bench/Results-linux/ATIS-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/ATIS-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/RUN-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/RUN-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/alter-table-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/alter-table-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/big-tables-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/big-tables-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/connect-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/connect-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/create-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/create-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/insert-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/insert-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/select-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/select-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/wisconsin-mysql_dbug-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      sql-bench/Results-linux/wisconsin-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
        ***MISSING WEAVE***
      374cc051
  7. 17 Dec, 2000 2 commits