1. 17 Sep, 2000 4 commits
    • unknown's avatar
      fixed resolve problems · 68598248
      unknown authored
      
      Docs/manual.texi:
        fixed bad reference
      sql/sql_lex.h:
        removed wrongly added backup_dir
      68598248
    • unknown's avatar
      Added changes lost during bk resolve · 09d02899
      unknown authored
      
      Docs/manual.texi:
        Added changes lost during bk resolve
      09d02899
    • unknown's avatar
      resolved conflicts · 5d4cae72
      unknown authored
      
      sql/sql_lex.h:
        Auto merged
      Docs/manual.texi:
        merged/resolved conflicts
      5d4cae72
    • unknown's avatar
      Docs/manual.texi · f22a1bfd
      unknown authored
          Updates for BACKUP TABLE/RESTORE TABLE
          Added Replication FAQ
          Cleaned up TODO list removing a duplicate and features already implemented
          Updated changelog for 3.23.25
      sql/sql_lex.h
          Re-added backup_dir to Lex which dispappeared while resovling conflicts
      
      
      Docs/manual.texi:
        Updates for BACKUP TABLE/RESTORE TABLE
        Added Replication FAQ
        Cleaned up TODO list removing a duplicate and features already implemented
        Updated changelog for 3.23.25
      sql/sql_lex.h:
        Re-added backup_dir to Lex which dispappeared while resovling conflicts
      f22a1bfd
  2. 16 Sep, 2000 3 commits
    • unknown's avatar
      Fix that REPAIR/ALTER TABLE use myisam_tempdir · 5a4aa474
      unknown authored
      
      include/myisam.h:
        Don't assume too big tempoary disks
      myisam/mi_check.c:
        Don't assume too big tempoary disks
      myisam/mi_static.c:
        Don't assume too big tempoary disks
      myisam/myisamdef.h:
        Fix type
      sql/ha_myisam.cc:
        Set myisamchk to use MySQL temporary disk space
      sql/slave.cc:
        Fix parameters
      sql/sql_lex.h:
        Added backup_dir
      5a4aa474
    • unknown's avatar
      Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql · 8c6b365e
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      8c6b365e
    • unknown's avatar
      Faster log::write() call, memory leak fix, flush master fix. · 19b678ee
      unknown authored
      
      BUILD/compile-alpha-ccc:
        remove deps to get things to compile better
      Docs/manual.texi:
        Small fixes
      configure.in:
        Fix for mlockmem()
      include/my_sys.h:
        Made key_cache_inited global
      myisammrg/myrg_close.c:
        Fixed memory leak
      myisammrg/myrg_open.c:
        Initialize queue to avoid memory leak bug
      mysys/mf_format.c:
        Added overflow check
      mysys/mf_keycache.c:
        Made key_cache_init more secure to use
      mysys/my_static.h:
        Make key_cache_inite global
      sql/ChangeLog:
        Changes
      sql/lock.cc:
        Added logging of locktime
      sql/log.cc:
        Added logging of locktime
      sql/mysql_priv.h:
        Added locked_in_memory
      sql/mysqld.cc:
        Added logging of locktime + locked in memory
      sql/sql_acl.cc:
        Added thd to log::write() for faster call
      sql/sql_base.cc:
        Use global key_cache variable
      sql/sql_class.cc:
        Added result row counting
      sql/sql_class.h:
        Added thd to log::write() for faster call
      sql/sql_db.cc:
        Added thd to log::write() for faster call
      sql/sql_delete.cc:
        Added thd to log::write() for faster call
      sql/sql_insert.cc:
        Added thd to log::write() for faster call
      sql/sql_load.cc:
        Added thd to log::write() for faster call
      sql/sql_parse.cc:
        Added thd to log::write() for faster call
      sql/sql_rename.cc:
        Added thd to log::write() for faster call
      sql/sql_table.cc:
        Added thd to log::write() for faster call
      sql/sql_update.cc:
        Added thd to log::write() for faster call
      19b678ee
  3. 15 Sep, 2000 3 commits
    • unknown's avatar
      merge of conflicts · ff1216a5
      unknown authored
      
      sql/ha_myisam.h:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      ff1216a5
    • unknown's avatar
      Added a comment about handler::restore() · 965a0b81
      unknown authored
      
      sql/handler.h:
        Added a comment
      965a0b81
    • unknown's avatar
      manual.texi: · e0c72def
      unknown authored
        FULLTEXT doesn't actually work with BLOBs.
      
      
      Docs/manual.texi:
        FULLTEXT doesn't actually work with BLOBs.
      e0c72def
  4. 14 Sep, 2000 6 commits
    • unknown's avatar
      BACKUP TABLE TO 'directory' · 2fdcf82e
      unknown authored
      RESTORE TABLE FROM 'directory'
      log on slave when it connects to the master
      
      
      include/mysql_com.h:
        Added COM_CONNECT_OUT so we can log on the slave when 
        connects to the master
      sql/ha_myisam.cc:
        added restore() and backup()
      sql/ha_myisam.h:
        Added restore() and backup()
      sql/handler.cc:
        restore()/backup()
      sql/handler.h:
        restore()/backup()
      sql/lex.h:
        BACKUP/RESTORE
      sql/mysql_priv.h:
        gave global ( non-static) scope to generate_table()
        added mysql_backup_table()/mysql_restore_table()
      sql/slave.cc:
        Log when slave connects to the master on the slave
      sql/sql_delete.cc:
        changed the scope of generate_table() from static to global
      sql/sql_lex.h:
        changes for BACKUP TABLE/RESTORE TABLE
      sql/sql_parse.cc:
        Changes for BACKUP TABLE/RESTORE TABLE
      sql/sql_table.cc:
        Changes for BACKUP TABLE/RESTORE TABLE
      sql/sql_yacc.yy:
        BACKUP TABLE/ RESTORE TABLE
      2fdcf82e
    • unknown's avatar
    • unknown's avatar
      configure fix to handle my_config.h · 87affa25
      unknown authored
      87affa25
    • unknown's avatar
      configure fixes · 3dac1751
      unknown authored
      
      scripts/make_binary_distribution.sh:
        Change mode to -rw-rw-r--
      scripts/mysql_convert_table_format.sh:
        Change mode to -rw-rw-r--
      scripts/mysql_find_rows.sh:
        Change mode to -rw-rw-r--
      scripts/mysql_setpermission.sh:
        Change mode to -rw-rw-r--
      scripts/mysql_zap.sh:
        Change mode to -rw-rw-r--
      scripts/mysqlaccess.sh:
        Change mode to -rw-rw-r--
      scripts/mysqlbug.sh:
        Change mode to -rw-rw-r--
      scripts/mysqlhotcopy.sh:
        Change mode to -rw-rw-r--
      scripts/safe_mysqld-watch.sh:
        Change mode to -rw-rw-r--
      scripts/safe_mysqld.sh:
        Change mode to -rw-rw-r--
      scripts/mysqlaccess.conf:
        Change mode to -rw-rw-r--
      support-files/binary-configure.sh:
        Change mode to -rw-rw-r--
      Docs/Makefile.am:
        Remove manual.ps when doing make distclean
      Docs/manual.texi:
        Fix
      Makefile.am:
        Fix that my_config.h is properly created and removed
      include/Makefile.am:
        Fix that my_config.h is properly created and removed
      libmysql/Makefile.shared:
        Add some distclean targets
      scripts/Makefile.am:
        Add some distclean targets
      support-files/Makefile.am:
        Add some distclean targets
      3dac1751
    • unknown's avatar
      Merge jcole@work.mysql.com:/home/bk/mysql · 473359b7
      unknown authored
      into ham.spaceapes.com:/usr/home/jcole/bk/mysql
      
      
      473359b7
    • unknown's avatar
      Fixed a problem with installing, for IRIX 'install', paths would · 38f214a1
      unknown authored
      be wrong and install would fail.
      
      
      sql/share/Makefile.am:
        When installing, should cd into the directory where the files 
        are coming from.  This caused a problem with one of our customers
        using an SGI IRIX machine, I'd guess that IRIX uses some version
        of install that doesn't disregard the path of the source file
        when copying the files.
      38f214a1
  5. 13 Sep, 2000 3 commits
    • unknown's avatar
      Fixes for MERGE TABLES and HEAP tables · d5964ba2
      unknown authored
      
      Docs/manual.texi:
        Updated MERGE table stuff + more
      extra/perror.c:
        Added missing error messages
      include/myisammrg.h:
        Fixes for MERGE TABLE
      include/queues.h:
        Fixes for MERGE TABLE
      isam/isamlog.c:
        Fixed hard bug
      myisam/mi_log.c:
        cleanup
      myisam/mi_open.c:
        Fixed file name format in myisam log
      myisam/myisamlog.c:
        Bug fixes
      myisammrg/mymrgdef.h:
        Fixes for MERGE TABLE
      myisammrg/myrg_create.c:
        Fixes for MERGE TABLE
      myisammrg/myrg_open.c:
        Fixes for MERGE TABLE
      myisammrg/myrg_queue.c:
        Fixes for MERGE TABLE
      myisammrg/myrg_rfirst.c:
        Fixes for MERGE TABLE
      myisammrg/myrg_rkey.c:
        Fixes for MERGE TABLE
      myisammrg/myrg_rlast.c:
        Fixes for MERGE TABLE
      myisammrg/myrg_rnext.c:
        Fixes for MERGE TABLE
      myisammrg/myrg_rprev.c:
        Fixes for MERGE TABLE
      myisammrg/myrg_rrnd.c:
        Fixes for MERGE TABLE
      mysql.proj:
        update
      mysys/queues.c:
        Fixed bug when using reverse queues
      sql-bench/test-insert.sh:
        Separated some things to get better timings
      sql/ha_heap.cc:
        Fixed heap table bug
      sql/ha_heap.h:
        Fixed heap table bug
      sql/ha_myisam.h:
        Fixed wrong max_keys
      sql/ha_myisammrg.cc:
        Fixed MERGE TABLES
      sql/ha_myisammrg.h:
        Fixed MERGE TABLES
      sql/handler.h:
        Fix for MERGE TABLES and HEAP tables
      sql/lex.h:
        Fixed MERGE TABLES
      sql/mysql_priv.h:
        Cleanup of code
      sql/sql_acl.cc:
        Fixed that privilege tables are flushed at start
      sql/sql_lex.h:
        Fixed MERGE TABLES
      sql/sql_parse.cc:
        Fixed MERGE TABLES
      sql/sql_select.cc:
        Fixes for HEAP tables
      sql/sql_table.cc:
        Cleanup
      sql/sql_yacc.yy:
        Fixed MERGE TABLES
      d5964ba2
    • unknown's avatar
      Merge work:/home/bk/mysql · 51fc6383
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      51fc6383
    • unknown's avatar
      Added information about MERGE tables · 9e37676d
      unknown authored
      9e37676d
  6. 12 Sep, 2000 7 commits
    • unknown's avatar
      Merge work:/home/bk/mysql · 862dcd6b
      unknown authored
      into mysql.sashanet.com:/home/sasha/src/bk/mysql
      
      
      sql/slave.cc:
        Auto merged
      862dcd6b
    • unknown's avatar
      fixed random exec times for connect stage of the slave thread · 751da00d
      unknown authored
      
      sql/slave.cc:
        fixed random exec times for connect stage of the slave thread
      751da00d
    • unknown's avatar
      Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql · 81dc9809
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      81dc9809
    • unknown's avatar
      Fixes for FULLTEXT and TIME type · 1040f1ac
      unknown authored
      
      Docs/manual.texi:
        Update of Linux notes and mysql_install_db
      include/my_tree.h:
        new tree function
      myisam/ft_parser.c:
        Fix free() bug
      myisam/ft_search.c:
        Fix free() bug
      myisam/ft_update.c:
        Fix free() bug
      scripts/safe_mysqld.sh:
        Check if we run as root
      sql-bench/Results-linux/ATIS-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/ATIS-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/RUN-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/RUN-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/alter-table-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/alter-table-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/big-tables-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/big-tables-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/connect-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/connect-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/create-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/create-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/insert-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/insert-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/select-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/select-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/Results-linux/wisconsin-mysql_fast-Linux_2.2.13_SMP_alpha:
        ***MISSING WEAVE***
      sql-bench/server-cfg.sh:
        Added use of OPTIMIZE TABLE
      sql-bench/test-ATIS.sh:
        Added use of OPTIMIZE TABLE
      sql-bench/test-insert.sh:
        Added use of OPTIMIZE TABLE
      sql-bench/test-select.sh:
        Added use of OPTIMIZE TABLE
      sql-bench/test-wisconsin.sh:
        Added use of OPTIMIZE TABLE
      sql/field.cc:
        Fix TIME type
      sql/item_func.h:
        Fixed Free bug
      1040f1ac
    • unknown's avatar
      Technical edit of first half of manual. · 8472c31a
      unknown authored
      
      Docs/manual.texi:
        Technical edit of first half.
        Fixed some ugly tables.
        Typo, english, and spelling corrections.
      8472c31a
    • unknown's avatar
      Merge · de04a97b
      unknown authored
      
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      de04a97b
    • unknown's avatar
      Update to new root alloc, OPTIMIZE TABLE and some other changes · fe4cccd6
      unknown authored
      
      Docs/manual.texi:
        Added chapter for binary log, updated the changelog, linux section, OPTIMIZE TABLE...
      client/mysqladmin.c:
        Fixed bug with pid-file handling.
      client/mysqldump.c:
        Version change
      configure.in:
        Version change
      include/Makefile.am:
        Fix for SCO to get sched.h removed.
      include/global.h:
        Increased MY_NFILE;  Added thread_safe_increment
      include/my_sys.h:
        Better root_alloc
      include/mysql.h:
        Better root_alloc
      include/mysys_err.h:
        Fix for PREAD/PWRITE on windows
      libmysql/libmysql.c:
        Better root_alloc
      myisam/mi_locking.c:
        Fix for PREAD/PWRITE on windows
      myisam/mi_static.c:
        Fix for PREAD/PWRITE on windows
      mysys/default.c:
        Better root_alloc
      mysys/errors.c:
        Fix for PREAD/PWRITE on windows
      mysys/my_alloc.c:
        Better root_alloc
      mysys/my_create.c:
        Fix for PREAD/PWRITE on windows
      mysys/my_fopen.c:
        Fix for PREAD/PWRITE on windows
      mysys/my_open.c:
        Fix for PREAD/PWRITE on windows
      mysys/my_pread.c:
        Fix for PREAD/PWRITE on windows
      mysys/tree.c:
        Better root_alloc
      readline/bind.c:
        Removed compiler warning
      readline/isearch.c:
        Removed compiler warning
      scripts/safe_mysqld.sh:
        Allow use of MYSQL_UNIX_PORT and MYSQL_TCP_PORT
      sql-bench/crash-me.sh:
        Version change
      sql-bench/limits/mysql-3.23.cfg:
        Update to latest MySQL version
      sql/filesort.cc:
        Added more statistics
      sql/ha_berkeley.h:
        Fixed bug with ORDER BY
      sql/ha_myisam.cc:
        Added OPTIMIZE TABLE and cleaned up the repair code
      sql/ha_myisam.h:
        Added OPTIMIZE TABLE and cleaned up the repair code
      sql/handler.cc:
        Added OPTIMIZE TABLE and cleaned up the repair code
      sql/handler.h:
        Added OPTIMIZE TABLE and cleaned up the repair code
      sql/item_func.cc:
        Fixed comment
      sql/item_timefunc.cc:
        Fixed possible month bug
      sql/mini_client.cc:
        Use of new root_alloc
      sql/mysql_priv.h:
        Added OPTIMIZE TABLE and cleaned up the repair code
      sql/mysqld.cc:
        Added more statistics
      sql/opt_range.cc:
        Use of new root_alloc
      sql/slave.cc:
        Use of new root_alloc
      sql/sql_acl.cc:
        Use of new root_alloc
      sql/sql_class.cc:
        Use of new root_alloc
      sql/sql_parse.cc:
        Use of new root_alloc
      sql/sql_select.cc:
        Added more statistics
      sql/sql_table.cc:
        Added OPTIMIZE TABLE and cleaned up the repair code
      sql/sql_udf.cc:
        Use of new root_alloc
      sql/sql_yacc.yy:
        Fixed that OPTIMIZE TABLE can take many tables as arguments
      sql/table.cc:
        Use of new root_alloc
      sql/thr_malloc.cc:
        Use of new root_alloc
      support-files/mysql.server.sh:
        Removed usage of AWK
      fe4cccd6
  7. 11 Sep, 2000 2 commits
    • unknown's avatar
      manual.texi Fixups for recent change notes. · 2f6af717
      unknown authored
      manual.texi	Changed instance of "data is" to "data are" (the
      manual.texi	manual generally treats data as a plural word).
      
      
      Docs/manual.texi:
        Fixups for recent change notes.
        Changed instance of "data is" to "data are" (the
        manual generally treats data as a plural word).
      2f6af717
    • unknown's avatar
      Merge paul@work.mysql.com:/home/bk/mysql · d3a01241
      unknown authored
      into central.snake.net:/usr/users/paul/mysql
      
      
      Docs/manual.texi:
        Auto merged
      d3a01241
  8. 10 Sep, 2000 4 commits
  9. 09 Sep, 2000 1 commit
    • unknown's avatar
      manual.texi: · 7babfeb0
      unknown authored
      chow -> show
      
      
      Docs/manual.texi:
        Monty: chow -> show
      7babfeb0
  10. 08 Sep, 2000 6 commits
    • unknown's avatar
      Merge paul@work.mysql.com:/home/bk/mysql · bd45d2e3
      unknown authored
      into central.snake.net:/usr/users/paul/mysql
      
      
      BitKeeper/etc/logging_ok:
        Auto merged
      Docs/manual.texi:
        Auto merged
      bd45d2e3
    • unknown's avatar
      logging_ok Logging to logging@openlogging.org accepted · 0bda2644
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      0bda2644
    • unknown's avatar
      Fixes for 3.23.24 · fba1498c
      unknown authored
      
      Build-tools/Do-all-build-steps:
        Fixed type in chmod
      scripts/make_binary_distribution.sh:
        All libmysqlclient_r files wheren't included
      fba1498c
    • unknown's avatar
      Fixed --no-defaults in installation · 1dc6a469
      unknown authored
      
      Build-tools/Do-compile:
        Fixed missing --no-defaults
      scripts/mysql_install_db.sh:
        Fixed --no-defaults
      1dc6a469
    • unknown's avatar
      Merge jcole@work.mysql.com:/home/bk/mysql · 9dd68559
      unknown authored
      into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
      
      
      Docs/manual.texi:
        Auto merged
      9dd68559
    • unknown's avatar
      manual.texi API's -> APIs · 85a0c922
      unknown authored
      manual.texi	@code{MySQL} -> @strong{MySQL}
      manual.texi	MacOS -> Mac OS, MacOSX -> Mac OS X (except in
      manual.texi	one place where it's the title of someone else's
      manual.texi	Web page)
      
      
      Docs/manual.texi:
        API's -> APIs
        @code{MySQL} -> @strong{MySQL}
        MacOS -> Mac OS, MacOSX -> MacOS X (except in
        one place where it's the title of someone else'ss
        Web page)
      85a0c922
  11. 07 Sep, 2000 1 commit