Commit graph

192301 commits

Author SHA1 Message Date
sasha@mysql.sashanet.com
9479eab469 Added changes lost during bk resolve 2000-09-16 18:35:58 -06:00
unknown
5d4cae7243 resolved conflicts
sql/sql_lex.h:
  Auto merged
Docs/manual.texi:
  merged/resolved conflicts
2000-09-16 18:31:30 -06:00
sasha@mysql.sashanet.com
037516b7a2 resolved conflicts 2000-09-16 18:31:30 -06:00
unknown
f22a1bfd20 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


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
2000-09-16 18:23:30 -06:00
sasha@mysql.sashanet.com
af9e034dac 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
2000-09-16 18:23:30 -06:00
unknown
5a4aa474d8 Fix that REPAIR/ALTER TABLE use myisam_tempdir
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
2000-09-16 19:06:21 +03:00
monty@donna.mysql.com
f2f515e5c2 Fix that REPAIR/ALTER TABLE use myisam_tempdir 2000-09-16 19:06:21 +03:00
unknown
8c6b365e7d Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
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
2000-09-16 04:27:49 +03:00
monty@donna.mysql.com
30bcd690f2 Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql 2000-09-16 04:27:49 +03:00
unknown
19b678eefe Faster log::write() call, memory leak fix, flush master fix.
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
2000-09-16 04:27:21 +03:00
monty@donna.mysql.com
751f2d1f16 Faster log::write() call, memory leak fix, flush master fix. 2000-09-16 04:27:21 +03:00
unknown
ff1216a5a9 merge of conflicts
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
2000-09-15 11:00:35 -06:00
sasha@mysql.sashanet.com
44bc3f9b0e merge of conflicts 2000-09-15 11:00:35 -06:00
unknown
965a0b8178 Added a comment about handler::restore()
sql/handler.h:
  Added a comment
2000-09-15 10:53:51 -06:00
sasha@mysql.sashanet.com
0a087649ec Added a comment about handler::restore() 2000-09-15 10:53:51 -06:00
unknown
e0c72def53 manual.texi:
FULLTEXT doesn't actually work with BLOBs.


Docs/manual.texi:
  FULLTEXT doesn't actually work with BLOBs.
2000-09-15 00:07:08 +00:00
jcole@ham.spaceapes.com
5d13884876 manual.texi:
FULLTEXT doesn't actually work with BLOBs.
2000-09-15 00:07:08 +00:00
unknown
2fdcf82ec5 BACKUP TABLE TO 'directory'
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
2000-09-14 16:34:50 -06:00
sasha@mysql.sashanet.com
44455063e5 BACKUP TABLE TO 'directory'
RESTORE TABLE FROM 'directory'
log on slave when it connects to the master
2000-09-14 16:34:50 -06:00
unknown
b35a18596c Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql 2000-09-14 15:41:20 +03:00
monty@donna.mysql.com
a99c1757be Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql 2000-09-14 15:41:20 +03:00
unknown
87affa2503 configure fix to handle my_config.h 2000-09-14 15:40:55 +03:00
monty@donna.mysql.com
ac93ec4ae1 configure fix to handle my_config.h 2000-09-14 15:40:55 +03:00
unknown
3dac17511b configure fixes
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
2000-09-14 15:10:06 +03:00
monty@donna.mysql.com
25106ec755 configure fixes 2000-09-14 15:10:06 +03:00
unknown
473359b7f0 Merge jcole@work.mysql.com:/home/bk/mysql
into ham.spaceapes.com:/usr/home/jcole/bk/mysql
2000-09-14 00:38:29 +00:00
jcole@ham.spaceapes.com
b2ead61526 Merge jcole@work.mysql.com:/home/bk/mysql
into ham.spaceapes.com:/usr/home/jcole/bk/mysql
2000-09-14 00:38:29 +00:00
unknown
38f214a14d Fixed a problem with installing, for IRIX 'install', paths would
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.
2000-09-14 00:33:16 +00:00
jcole@ham.spaceapes.com
e6c278bef7 Fixed a problem with installing, for IRIX 'install', paths would
be wrong and install would fail.
2000-09-14 00:33:16 +00:00
unknown
d5964ba20c Fixes for MERGE TABLES and HEAP tables
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
2000-09-14 02:39:07 +03:00
monty@donna.mysql.com
b581f17be2 Fixes for MERGE TABLES and HEAP tables 2000-09-14 02:39:07 +03:00
unknown
51fc63837a Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-09-13 14:47:35 -06:00
sasha@mysql.sashanet.com
243579e8b2 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-09-13 14:47:35 -06:00
unknown
0c94418053 logging_ok Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-09-12 23:28:17 -04:00
tim@threads.polyesthetic.msg
17556153ee logging_ok Logging to logging@openlogging.org accepted 2000-09-12 23:28:17 -04:00
unknown
e79959fda8 configure.in remove some stray warning messages for failed tests
safe_mysqld.sh	remove some stray warning messages for failed tests


configure.in:
  remove some stray warning messages for failed tests
scripts/safe_mysqld.sh:
  remove some stray warning messages for failed tests
2000-09-12 23:24:02 -04:00
tim@threads.polyesthetic.msg
0935747126 configure.in remove some stray warning messages for failed tests
safe_mysqld.sh	remove some stray warning messages for failed tests
2000-09-12 23:24:02 -04:00
unknown
9e37676d7c Added information about MERGE tables 2000-09-13 04:31:29 +03:00
monty@donna.mysql.com
7e543b4d4b Added information about MERGE tables 2000-09-13 04:31:29 +03:00
unknown
862dcd6bd5 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


sql/slave.cc:
  Auto merged
2000-09-12 17:47:17 -06:00
sasha@mysql.sashanet.com
3264b2cf3e Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-09-12 17:47:17 -06:00
unknown
751da00d0e fixed random exec times for connect stage of the slave thread
sql/slave.cc:
  fixed random exec times for connect stage of the slave thread
2000-09-12 17:46:37 -06:00
sasha@mysql.sashanet.com
71054deeec fixed random exec times for connect stage of the slave thread 2000-09-12 17:46:37 -06:00
unknown
81dc980919 Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
2000-09-13 01:10:56 +03:00
monty@donna.mysql.com
d59737e3de Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql 2000-09-13 01:10:56 +03:00
unknown
1040f1ac8e Fixes for FULLTEXT and TIME type
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
2000-09-13 01:08:34 +03:00
monty@donna.mysql.com
4726593862 Fixes for FULLTEXT and TIME type 2000-09-13 01:08:34 +03:00
unknown
8472c31ac8 Technical edit of first half of manual.
Docs/manual.texi:
  Technical edit of first half.
  Fixed some ugly tables.
  Typo, english, and spelling corrections.
2000-09-12 15:42:55 +00:00
jcole@ham.spaceapes.com
6977b7cfaa Technical edit of first half of manual. 2000-09-12 15:42:55 +00:00
unknown
de04a97b61 Merge
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2000-09-12 03:14:13 +03:00