Commit graph

421 commits

Author SHA1 Message Date
unknown
9ca5f114ea merge/resolve conflicts
sql/mysqld.cc:
  merged changes
2000-09-28 16:29:00 -06:00
unknown
af033a3255 This one will not be pushed, I am committing to be able to pull in Monty's changes
added server id, mostly working
added --skip-slave-start, working
added --replicate-rewrite-db - just in the cmd line parses, currently noop


sql/log_event.cc:
  added server id
sql/log_event.h:
  added server id
sql/mysql_priv.h:
  server id
sql/mysqlbinlog.cc:
  server id
sql/mysqld.cc:
  server id, --skip-slave-start, --replicate-rewrite-db
sql/share/romanian/errmsg.sys:
  somehow got touched and bk thinks it is modified
sql/slave.cc:
  server id, fixed typo in error message, cleaned up
sql/sql_class.cc:
  server id in THD
sql/sql_class.h:
  server id in THD
2000-09-28 16:24:50 -06:00
unknown
27a17a6ef9 Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
2000-09-29 00:59:25 +03:00
unknown
c33289a3a1 Fixed indention, removed compiler varnings and fixed a bug
in FULLTEXT indexes.


Docs/manual.texi:
  Removed some @ifset nushere tags which crashed the manual
  when using emacs
client/mysql-test.c:
  ***MISSING WEAVE***
heap/hp_test2.c:
  Removed compiler warnings
isam/pack_isam.c:
  Removed compiler warnings
isam/update.c:
  Removed compiler warnings
myisam/ft_parser.c:
  cleanup
myisam/ft_update.c:
  Fixed crash when inserting a blob which was NULL
myisam/mi_check.c:
  -e continues checking of other keys on error
myisam/mi_rkey.c:
  cleanup
myisam/myisamchk.c:
  cleanup
myisam/myisamlog.c:
  Added use of rnd to make things more predictable
myisammrg/myrg_rkey.c:
  Removed compiler warnings
mysys/mf_pack.c:
  cleanup
mysys/my_fstream.c:
  cleanup
sql/ha_berkeley.cc:
  cleanup
sql/handler.cc:
  cleanup
sql/item_func.cc:
  cleanup
sql/item_func.h:
  cleanup
sql/net_serv.cc:
  cleanup
sql/slave.cc:
  cleanup
sql/sql_class.cc:
  cleanup
sql/sql_show.cc:
  cleanup
2000-09-29 00:58:16 +03:00
unknown
f613c4f1e3 Put the contents at the beginning of the manual like a normal book.
Docs/manual.texi:
  Put the Contents at the beginning like a normal book.
2000-09-28 02:56:54 -05:00
unknown
7925447931 Fixed Typos.
Docs/manual.texi:
  Fixed Melissa Spurr's Texinfo Typos.
2000-09-28 02:43:39 -05:00
unknown
3aaef55966 Merge
Docs/manual.texi:
  merged melissa spurr's newest edits into the manual.
2000-09-28 03:15:40 -04:00
unknown
357788e811 NuSphere editor's changes to pages 151-200 of manual.texi.
Docs/manual.texi:
  NuSphere editor's changes to pages 151-200.
2000-09-27 17:40:42 -05:00
unknown
311fd57400 made additions and some changes to index hits
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-09-27 17:31:02 -04:00
unknown
f40b8ab3f0 NuSphere editor's changes to pages 101-150 of manual.texi.
Docs/manual.texi:
  NuSphere editor's changes to pages 101-150.
2000-09-27 15:33:02 -05:00
unknown
3a5ab655f1 Fix typo in manual.texi
Docs/manual.texi:
  Fix typo
2000-09-27 11:51:01 +03:00
unknown
53d583ca6b Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql 2000-09-27 11:48:01 +03:00
unknown
d9c70f5d78 Bigger ranges if set_maximum_open_files fails + fix for release
sql-bench/Results/ATIS-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/RUN-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/alter-table-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/big-tables-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/connect-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/create-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/insert-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/select-mysql-NT_4.0:
  new benchmark results
sql-bench/Results/wisconsin-mysql-NT_4.0:
  new benchmark results
sql/mysqld.cc:
  Bigger ranges if set_maximum_open_files fails
2000-09-27 11:47:30 +03:00
unknown
3b86d2e5b3 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2000-09-27 02:10:32 -05:00
unknown
11ef39ae33 Added the first of Melissa Spurr's (NuSphere's) index additions in.
Sucks when you have to do it the manual way.  bk diffs, patch, xemacs.


Docs/manual.texi:
  Added the first of Melissa Spurr's (NuSphere's) index additions in.
2000-09-27 02:05:48 -05:00
unknown
a8d537a28b Fixed mysql_install_db.sh
scripts/mysql_install_db.sh:
  Added missing variable
2000-09-27 04:04:25 +03:00
unknown
8bd8993cd3 Fixes for release
include/config-win.h:
  Increase the number of files on windows
include/mysys_err.h:
  New error message
myisam/mi_log.c:
  Fix myisam.log to be usable even if we are using NFS
myisam/myisamdef.h:
  Fix myisam.log to be usable even if we are using NFS
mysys/errors.c:
  Fix error message
2000-09-27 02:40:54 +03:00
unknown
32fc4416af Docs/Makefile.am:
PDF Manual now has Indexes.
Docs/manual.texi:
  Added stub and conditionals for removing GPL and LGPL from NuSphere
  manual.


Docs/Makefile.am:
  PDF Manual now has Indexes
Docs/manual.texi:
  Added stub and conditionals for removing GPL and LGPL from NuSphere
  manual.
2000-09-26 17:28:18 -05:00
unknown
b95853972a Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
2000-09-26 22:40:49 +03:00
unknown
b31f06a74e Small fixes for release
Docs/manual.texi:
  Update of file limits on windows
myisam/mi_close.c:
  Fix for alter table on windows
myisam/mi_extra.c:
  Fix for alter table on windows
myisam/myisamlog.c:
  Corrected statistics information
sql-bench/limits/mysql-3.23.cfg:
  Update to new crash-me
sql-bench/limits/mysql.cfg:
  Update to new crash-me
sql/sql_base.cc:
  Fix if end of memory
sql/table.cc:
  Fix of new introduced index-handling bug
2000-09-26 22:39:45 +03:00
unknown
6cf0e5f967 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Auto merged
2000-09-26 13:01:02 -05:00
unknown
17d6b65a71 manual.texi Added ValueClick mirror.
Docs/manual.texi:
  Added ValueClick mirror.
2000-09-25 21:41:06 -05:00
unknown
f0c7c83841 merge
BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Merge
2000-09-26 02:59:26 +03:00
unknown
48e80bd5ec Small fixes
Docs/manual.texi:
  Changelog and small fixes
mysys/my_init.c:
  Changed UMASK and UMASK_DIR to work also with octal
scripts/mysqlhotcopy.sh:
  Fixed some small bugs
sql/share/swedish/errmsg.OLD:
  Fixed wrong entry
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-09-26 02:57:29 +03:00
unknown
7fe58c4f5b RIGHT JOIN, part of automatic repair of MyISAM tables, backup on repair,
reading from FIFO, fixes for FULLTEXT, @@IDENTITY


Docs/manual.texi:
  Update of RIGHT JOIN
client/mysql.cc:
  Faster HTML generation
extra/perror.c:
  Added MyISAM error messages
include/my_base.h:
  Update for automatic repair of MyISAM tables
include/my_sys.h:
  Backup files and FIFO
include/myisam.h:
  Automatic repair and backup files
include/mysqld_error.h:
  New error message
myisam/mi_check.c:
  Update for automatic repair of MyISAM tables
myisam/mi_locking.c:
  Fixed comment
myisam/mi_open.c:
  Update for automatic repair of MyISAM tables
myisam/myisamchk.c:
  Update for automatic repair of MyISAM tables
myisam/myisamdef.h:
  Update for automatic repair of MyISAM tables
mysys/mf_getdate.c:
  Added new parameter option for backup files
mysys/my_open.c:
  Added debug information
mysys/my_redel.c:
  Backup file handling
sql/ha_berkeley.cc:
  Updated interface
sql/ha_berkeley.h:
  Updated interface
sql/ha_heap.cc:
  Updated interface
sql/ha_heap.h:
  Updated interface
sql/ha_isam.cc:
  Updated interface
sql/ha_isam.h:
  Updated interface
sql/ha_isammrg.cc:
  Updated interface
sql/ha_isammrg.h:
  Updated interface
sql/ha_myisam.cc:
  Update for automatic repair of MyISAM tables
sql/ha_myisam.h:
  Updated interface
sql/ha_myisammrg.cc:
  Updated interface
sql/ha_myisammrg.h:
  Updated interface
sql/handler.h:
  Updated interface
sql/item.h:
  Added @@identity
sql/item_func.cc:
  Added @@identity
sql/lex.h:
  Added RIGHT JOIN
sql/mf_iocache.cc:
  Update for reading from FIFO
sql/mysqld.cc:
  Update for automatic repair of MyISAM tables
sql/share/czech/errmsg.sys:
  Added @@identity
sql/share/czech/errmsg.txt:
  Added @@identity
sql/share/danish/errmsg.sys:
  Added @@identity
sql/share/danish/errmsg.txt:
  Added @@identity
sql/share/dutch/errmsg.sys:
  Added @@identity
sql/share/dutch/errmsg.txt:
  Added @@identity
sql/share/english/errmsg.sys:
  Added @@identity
sql/share/english/errmsg.txt:
  Added @@identity
sql/share/estonian/errmsg.sys:
  Added @@identity
sql/share/estonian/errmsg.txt:
  Added @@identity
sql/share/french/errmsg.sys:
  Added @@identity
sql/share/french/errmsg.txt:
  Added @@identity
sql/share/german/errmsg.sys:
  Added @@identity
sql/share/german/errmsg.txt:
  Added @@identity
sql/share/greek/errmsg.sys:
  Added @@identity
sql/share/greek/errmsg.txt:
  Added @@identity
sql/share/hungarian/errmsg.sys:
  Added @@identity
sql/share/hungarian/errmsg.txt:
  Added @@identity
sql/share/italian/errmsg.sys:
  Added @@identity
sql/share/italian/errmsg.txt:
  Added @@identity
sql/share/japanese/errmsg.sys:
  Added @@identity
sql/share/japanese/errmsg.txt:
  Added @@identity
sql/share/korean/errmsg.sys:
  Added @@identity
sql/share/korean/errmsg.txt:
  Added @@identity
sql/share/norwegian-ny/errmsg.txt:
  Added @@identity
sql/share/norwegian/errmsg.txt:
  Added @@identity
sql/share/polish/errmsg.sys:
  Added @@identity
sql/share/polish/errmsg.txt:
  Added @@identity
sql/share/portuguese/errmsg.sys:
  Added @@identity
sql/share/portuguese/errmsg.txt:
  Added @@identity
sql/share/romanian/errmsg.txt:
  Added @@identity
sql/share/russian/errmsg.sys:
  Added @@identity
sql/share/russian/errmsg.txt:
  Added @@identity
sql/share/slovak/errmsg.sys:
  Added @@identity
sql/share/slovak/errmsg.txt:
  Added @@identity
sql/share/spanish/errmsg.sys:
  Added @@identity
sql/share/spanish/errmsg.txt:
  Added @@identity
sql/share/swedish/errmsg.OLD:
  Added @@identity
sql/share/swedish/errmsg.sys:
  Added @@identity
sql/share/swedish/errmsg.txt:
  Added @@identity
sql/sql_base.cc:
  Fix for RIGHT JOIN
sql/sql_db.cc:
  Update for automatic repair of MyISAM tables
sql/sql_load.cc:
  Added reading from FIFO
sql/sql_parse.cc:
  Fix for RIGHT JOIN
sql/sql_select.cc:
  Fix for RIGHT JOIN
sql/sql_table.cc:
  cleanup
sql/sql_yacc.yy:
  Added RIGHT JOIN
sql/table.cc:
  Fix handling of FULLTEXT index
sql/table.h:
  Added RIGHT JOIN
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-09-26 00:33:25 +03:00
unknown
88b79d2200 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Auto merged
2000-09-25 14:26:15 -05:00
unknown
2fdf8e6b7e manual.texi Reactivated sote.hu mirror.
Docs/manual.texi:
  Reactivated sote.hu mirror.
2000-09-25 13:56:58 -05:00
unknown
2e8e75436a manual.texi Reactivated sopik.cz mirror.
Docs/manual.texi:
  Reactivated sopik.cz mirror.
2000-09-25 03:12:38 -05:00
unknown
5ef52acffd manual.texi Reactivated directnet.ru and psinet.cl mirrors.
Docs/manual.texi:
  Reactivated directnet.ru and psinet.cl mirrors.
2000-09-25 00:12:04 -05:00
unknown
de17c6d32b safe_mysqld.sh remove stray warning message from nohup nice
configure.in	the & in 2>&1 gets replaced by sed during AC_SUBST


configure.in:
  the & in 2>&1 gets replaced by sed during AC_SUBST
scripts/safe_mysqld.sh:
  remove stray warning message from nohup nice
2000-09-23 12:39:40 -04:00
unknown
3b6a084a24 merge nohup niceness changes
configure.in:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
scripts/safe_mysqld.sh:
  merge nohup_niceness changes
2000-09-23 11:38:49 -04:00
unknown
d7a8efc3b7 NuSphere editor's changes to pages 65-100 of manual.texi.
Docs/manual.texi:
  NuSphere editor's changes to pages 65-100.
2000-09-22 21:51:03 -05:00
unknown
1add42f680 NuSphere editor's changes to pages 18-64 of manual.texi.
Docs/manual.texi:
  NuSphere editor's changes to pages 18-64.
2000-09-22 17:05:39 -05:00
unknown
5359e76aad manual.texi merged, oh so painful. 2000-09-22 14:28:01 -05:00
unknown
acadb7c901 Merge jcole@work.mysql.com:/home/bk/mysql
into main.burghcom.com:/usr/home/nusphere/bk/mysql


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-09-22 15:11:22 -04:00
unknown
5b5d69ffbb manual.texi Reactivated paco.net mirror.
Docs/manual.texi:
  Reactivated paco.net mirror.
2000-09-22 13:22:50 -05:00
unknown
a4a12f8f44 manual.texi Cotton pickin bk! Let me push this!!
Docs/manual.texi:
  Cotton pickin bk! Let me push this!!
2000-09-22 08:50:07 +02:00
unknown
cd13c8445d Docs/manual.texi
added updated for FLUSH LOGS and replication
sql/log.cc
    fixed the log rotation bug when the log name did not change after
    FLUSH LOGS


Docs/manual.texi:
  added updated for FLUSH LOGS and replication
sql/log.cc:
  fixed the log rotation bug when the log name did not change after
  FLUSH LOGS
sql/sql_class.h:
  fixed the log rotation bug when the log name did not change after
  FLUSH LOGS
2000-09-21 22:27:21 -06:00
unknown
593d651d5b NuSphere editor's changes to pages 1-17 2000-09-21 17:59:44 -05:00
unknown
5f12486229 Fixes for MyISAM and packed keys + AIX
Docs/manual.texi:
  Updated changelog
client/mysql.cc:
  Free all memory, even if we can't connect to the server
include/config-win.h:
  Ensure that we don't use SAFE_MUTEX on windows
include/my_pthread.h:
  Optimze struct for Ia64
include/myisam.h:
  Hack for debugging BIG tables
myisam/mi_check.c:
  Hack for debugging BIG tables
myisam/mi_search.c:
  Fixed bug in packed keys
myisam/myisamchk.c:
  Hack for debugging BIG tables
mysys/thr_mutex.c:
  Make safe_mutex safe for windows
scripts/safe_mysqld.sh:
  Fix nice test and echo output
sql/share/Makefile.am:
  Fix character sets
sql/sql_string.cc:
  Fixes for AIX (which can't handle that the length argument is 0)
2000-09-22 01:46:26 +03:00
unknown
5e955288bc Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
2000-09-21 02:25:13 +03:00
unknown
43044b685f Fix for SAFE_MUTEX + MERGE tables
Docs/manual.texi:
  Fix for release
include/my_pthread.h:
  Fix for SAFE_MUTEX for windows
include/myisammrg.h:
  Fix for empty MERGE tables
myisam/ft_stopwords.c:
  Free used memory
myisammrg/myrg_open.c:
  Fix for empty MERGE tables
myisammrg/myrg_queue.c:
  Fix for empty MERGE tables
myisammrg/myrg_rfirst.c:
  cleanup
myisammrg/myrg_rkey.c:
  cleanup
mysys/my_thr_init.c:
  Fix SAFE_MUTEX for windows
mysys/my_winthread.c:
  Fix SAFE_MUTEX for windows
mysys/thr_mutex.c:
  Fix SAFE_MUTEX for windows
sql/ha_myisammrg.cc:
  Fix for empty MERGE tables
sql/mysqld.cc:
  Fix type
2000-09-21 01:58:38 +03:00
unknown
e79e810248 manual.texi Fixed typos in mirror listing.
Docs/manual.texi:
  Fixed typos in mirror listing.
2000-09-20 15:29:51 -05:00
unknown
5cde8f058e Merge nusphere@snoop.burghcom.com:/home/nusphere/bk/mysql
into nslinux.bedford.progress.com:/users/devp/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2000-09-20 15:29:42 -04:00
unknown
346636a49b manual.texi Reactivated some mirrors.
Docs/manual.texi:
  Reactivated some mirrors.
2000-09-20 14:24:34 -05:00
unknown
0f31a07608 testing from NuSphere
Docs/manual.texi:
  Changed a Unix to UNIX.. testing bk from NuSphere
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-09-20 15:13:58 -04:00
unknown
73826420c3 Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql 2000-09-20 19:37:35 +03:00
unknown
0d788b1e91 Fix for SAFE_MUTEX on windows
Docs/manual.texi:
  cleanup
include/my_pthread.h:
  Fix for SAFEMUTEX under windows
mysys/my_thr_init.c:
  Fix for SAFEMUTEX under windows
mysys/my_winthread.c:
  Fix for SAFEMUTEX under windows
mysys/thr_mutex.c:
  Fix for SAFEMUTEX under windows
sql/mysqld.cc:
  Remove unused code
sql/sql_table.cc:
  Fix filename comparison on Windows
support-files/Makefile.am:
  Added magic file
2000-09-20 19:37:07 +03:00
unknown
7ae27ed3b7 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.bedford.progress.com:/usr/home/jcole/bk/mysql


configure.in:
  Auto merged
2000-09-20 09:03:50 -05:00
unknown
f229846f2d removed misplaced comma in configure.in
configure.in:
  removed comma, wasn't supposed to be there, causing problems ;)
2000-09-19 22:23:56 -05:00