Commit graph

519 commits

Author SHA1 Message Date
unknown
c8f30e8f62 Merge 2000-10-09 23:28:27 +02:00
unknown
3e6dcfe45e Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work
2000-10-09 17:05:33 -04:00
unknown
5096b5dd5b Merge 2000-10-09 22:19:57 +02:00
unknown
b465979edc Show charsets dir in error message, instead of just "path: default".
include/my_sys.h:
  make get_charsets_dir a public function
libmysql/libmysql.c:
  show charsets dir instead of the string "default" in error message
mysys/charset.c:
  make get_charsets_dir a public function
2000-10-09 16:10:41 -04:00
unknown
3f65aeb651 sql_select.cc Coredump in FULLTEXT code fixed
sql_select.cc	sasha's workaround removed


sql/sql_select.cc:
  Coredump in FULLTEXT code fixed
2000-10-09 22:10:10 +02:00
unknown
3c552b4b9b fix NuSphere bug that generated bad HTML
Docs/manual.texi:
  moved @cindex uptime to the right place, so that texi2html does
  actually generate an achor for it
2000-10-09 12:09:23 -06:00
unknown
6942c74c19 manual.texi Reworked propaganda in Contact information section.
Docs/manual.texi:
  Reworked propaganda in Contact information section.
2000-10-09 05:56:51 -05:00
unknown
d61670a531 manual.texi Reactivated some mirrors.
Docs/manual.texi:
  Reactivated some mirrors.
2000-10-09 00:24:10 -05:00
unknown
ebfb23ab25 Merge 2000-10-09 00:02:54 +02:00
unknown
4869508137 Oops - forgot to add files to bk
sql/opt_ft.cc:
  Change mode to -rw-rw-r--
sql/opt_ft.h:
  Change mode to -rw-rw-r--
2000-10-09 00:00:24 +02:00
unknown
ce58bb01db Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


Docs/manual.texi:
  Auto merged
2000-10-08 01:49:59 -06:00
unknown
9e7f2c9f2d Docs/manual.texi
replication updates
sql/opt_range.h
    fixed compiler warning
sql/slave.cc
    fixed handling of long usernames
    fixed insert_id + query log event processing atomicity in the case
    of slave death
    fix edcharset coversion to not be global to all threads
sql/sql_class.h
    fix to make insert_id event and the subsequent query event be still processed
    atomically if slave dies in the middle
sql/sql_select.cc
    temp fix to make it compile 
repl-tests/test-auto-inc/run.test@1.1
    New BitKeeper file ``repl-tests/test-auto-inc/run.test''
repl-tests/test-auto-inc/x.master@1.1
    New BitKeeper file ``repl-tests/test-auto-inc/x.master''



Docs/manual.texi:
  replication updates
sql/opt_range.h:
  fixed compiler warning
sql/slave.cc:
  fixed handling of long usernames
  fixed insert_id + query log event processing atomicity in the case
  of slave death
  fix edcharset coversion to not be global to all threads
sql/sql_class.h:
  fix to make insert_id event and the subsequent query event be still processed
  atomically if slave dies in the middle
sql/sql_select.cc:
  temp fix to make it compile
2000-10-08 01:48:50 -06:00
unknown
f5221dd537 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2000-10-08 00:09:58 -05:00
unknown
6d3e5d7cb0 Changed even page heading on NuSphere manual.
Docs/manual.texi:
  Changed evenheading on NuSphere manual.
2000-10-08 00:09:01 -05:00
unknown
4af074054b Merge
configure.in:
  merged
BitKeeper/etc/logging_ok:
  Auto merged
sql/filesort.cc:
  merged
sql/sql_select.cc:
  merged
2000-10-07 14:05:45 +02:00
unknown
c286021a37 ORDER BY works with FULLTEXT keys 2000-10-07 13:59:47 +02:00
unknown
aaea3431d3 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-06 19:07:59 -06:00
unknown
98d6bfaf06 sql/log.cc
set character set is not being logged


sql/log.cc:
  set character set is not being logged
2000-10-06 19:07:15 -06:00
unknown
dbde9337c2 Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-06 21:18:40 +03:00
unknown
6991b70c87 DISTINCT optimization
Fixes when using column privileges
Manual updates


Docs/manual.texi:
  Comments from MySQL training + distinct optimization
extra/my_print_defaults.c:
  Added --defaults-extra-file
include/my_sys.h:
  Added --defaults-extra-file
mysys/default.c:
  Added --defaults-extra-file
sql/sql_acl.cc:
  Tables with only column privileges didn't show up in SHOW GRANTS or SHOW TABLES
sql/sql_select.cc:
  DISTINCT optimization
sql/sql_select.h:
  DISTINCT optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-06 21:15:03 +03:00
unknown
7e52afcd93 sql/log.cc
Added magic number to binlog
sql/log_event.cc
    distinquish bogus data from truncated logs
sql/log_event.h
    added magic number
    added LOG_READ_TRUNC error
sql/mysqlbinlog.cc
    fixed to handle magic number
    added O_BINARY to my_fopen
sql/mysqld.cc
    added code for replicate-rewrite-db
sql/slave.cc
    replicate-rewrite-db
    O_BINARY
    handle magic
sql/sql_class.h
    added i_string_pair class
sql/sql_repl.cc
    added magic
    better error messages
support-files/magic
    added magic for binlog

Added test case for replication of queries with error


sql/log.cc:
  Added magic number to binlog
sql/log_event.cc:
  distinquish bogus data from truncated logs
sql/log_event.h:
  added magic number
  added LOG_READ_TRUNC error
sql/mysqlbinlog.cc:
  fixed to handle magic number
  added O_BINARY to my_fopen
sql/mysqld.cc:
  added code for replicate-rewrite-db
sql/slave.cc:
  replicate-rewrite-db
  O_BINARY
  handle magic
sql/sql_class.h:
  added i_string_pair class
sql/sql_repl.cc:
  added magic
  better error messages
support-files/magic:
  added magic for binlog
2000-10-05 17:58:16 -06:00
unknown
295c3d1fa9 Fixed bug in how FAST and CHANGED worked
Docs/manual.texi:
  Removed bugs from manual; Updated CHECK TABLE
2000-10-05 02:22:28 +03:00
unknown
36129d4ea0 Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
  Auto merged
2000-10-05 01:01:07 +03:00
unknown
affe94dc80 Small fixes
configure.in:
  Fix for mkstemp
libmysql/Makefile.shared:
  Fix for mkstemp
myisam/mi_open.c:
  Added more debug info
mysys/mf_tempfile.c:
  Fixed type
sql/sql_repl.cc:
  Added missing header file
2000-10-05 01:00:36 +03:00
unknown
71e8ccf9f7 ltmain.sh Don't add -lc to deplibs under FreeBSD
ltmain.sh:
  Don't add -lc to deplibs under FreeBSD
2000-10-04 17:54:49 -04:00
unknown
90cfd0a099 merge 2000-10-04 15:26:54 -05:00
unknown
0ac3b21340 merge
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Merge
support-files/mysql.spec.sh:
  Merge
2000-10-04 23:22:53 +03:00
unknown
fc78fef796 Portability fixes
Docs/manual.texi:
  Updates in the links sections
config.guess:
  Added fixes for Darwin
config.sub:
  Added fixes for Darwin
configure.in:
  Added fixes for Darwin
extra/my_print_defaults.c:
  Fixed typo
include/my_pthread.h:
  Added fixes for Darwin
ltconfig:
  Portability fix
myisam/mi_check.c:
  Make myisamchk more silent
mysys/Makefile.am:
  Added mf_tempfile.c
mysys/mf_cache.c:
  Remove not used parts
mysys/mf_tempfile.c:
  Fix for Solaris
sql/log.cc:
  Fix for Windows
sql/sql_cache.cc:
  Fix for Darwin
sql/sql_show.cc:
  Fix for temporary tables
strings/strtol.c:
  Fix for Darwin
support-files/mysql.spec.sh:
  Fix for documentation files that are installed compressed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-04 23:20:16 +03:00
unknown
170775da2f index hits added. oh so painful.
Docs/manual.texi:
  index hits added.
BitKeeper/etc/logging_ok:
  ***MISSING TEXT***
2000-10-04 15:12:12 -05:00
unknown
fbf0a2bccf Adde NuSphere editor's changes to pages 201-240 of manual.texi.
Docs/manual.texi:
  Adde NuSphere editor's changes to pages 201-240.
2000-10-04 13:54:40 -05:00
unknown
47d38f680b configure.in Add check for pdftex
Docs/Makefile.am   Do not compile manual.pdf if pdftex not present


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/Makefile.am:
  Do not compile manual.pdf if pdftex not present
configure.in:
  Add check for pdftex
2000-10-04 19:07:59 +02:00
unknown
674eea5ff4 sql_table.cc key length limit check disabled for FULLTEXT
ft_parser.c	Nasty buffer overflow fixed


myisam/ft_parser.c:
  Nasty buffer overflow fixed
sql/sql_table.cc:
  key length limit check disabled for FULLTEXT
2000-10-04 17:26:31 +02:00
unknown
cbc817fa0c manual.texi @uref'ed some order.mysql.com URLs that I caught.
Docs/manual.texi:
  @uref'ed some order.mysql.com URLs that I caught.
2000-10-04 02:05:31 -05:00
unknown
9aa1c9d4a2 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-10-03 19:54:37 -06:00
unknown
cfc4a2e74e fixed mutex bug ( or lack of it) when reading log entries on COM_BINLOG_DUMP
added error_code to query event, and checking to see if we get the
expected error on the slave
removed obsolete code from slave.cc


sql/log_event.cc:
  added mutex as an argument to FILE read_log_event functions
sql/log_event.h:
  added error_code for the query event
sql/mysqlbinlog.cc:
  fix for new form of read_log_event
sql/slave.cc:
  removed obsolte code with fetch nx table
  added check to see if the query runs with the same error on the slave
  as it did on the master
sql/sql_repl.cc:
  fixed mutex problem around read_log_event
2000-10-03 19:53:13 -06:00
unknown
c8367c1ae6 manual.texi Minor fixes to recent change notes.
Docs/manual.texi:
  Minor fixes to recent change notes.
2000-10-03 12:58:40 -05:00
unknown
63b7b45ff7 First part of automatic repair of MyISAM tables.
Error on full disk on repair.
SIGHUP signal handling.
Update with keys on timestamp
Portability fixes


Docs/manual.texi:
  Added documentation about automatic repair of MyISAM tables
client/mysql.cc:
  Remove usage of tempnam.
include/my_sys.h:
  Added create_temp_file
include/myisam.h:
  Fix for disk full on repair
myisam/mi_check.c:
  Fix for disk full on repair
myisam/sort.c:
  Fix for disk full on repair & removed usage of tempnam()
mysys/mf_cache.c:
  Remove usage of tempnam()
mysys/mf_dirname.c:
  Changed convert_dirname to return end 0
mysys/my_fopen.c:
  Security fixes
mysys/my_tempnam.c:
  remove blanks
readline/bind.c:
  Portability fixes
readline/complete.c:
  Portability fixes
readline/histexpand.c:
  Portability fixes
readline/input.c:
  Portability fixes
readline/search.c:
  Portability fixes
readline/shell.c:
  Portability fixes
readline/terminal.c:
  Portability fixes
readline/tilde.c:
  Portability fixes
readline/undo.c:
  Portability fixes
regex/cname.h:
  Portability fixes
regex/debug.c:
  Portability fixes
regex/main.c:
  Portability fixes
regex/regcomp.c:
  Portability fixes
regex/regerror.c:
  Portability fixes
sql/filesort.cc:
  Remove dummy code
sql/ha_myisam.cc:
  Automatic repair of MyISAM tables
sql/ha_myisam.h:
  Automatic repair of MyISAM tables
sql/handler.cc:
  Automatic repair of MyISAM tables
sql/handler.h:
  Automatic repair of MyISAM tables
sql/key.cc:
  Fix for UPDATE with key on timestamp column
sql/mysql_priv.h:
  Automatic repair of MyISAM tables
sql/mysqld.cc:
  Automatic repair of MyISAM tables & signal SIGHUP handling
sql/sql_base.cc:
  Automatic repair of MyISAM tables
sql/sql_class.cc:
  Automatic repair of MyISAM tables
sql/sql_class.h:
  Fix for insert with reference to columns
sql/sql_insert.cc:
  Fix for insert with reference to columns
sql/table.cc:
  Automatic repair of MyISAM tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-03 14:18:03 +03:00
unknown
ddae2009f5 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-10-02 17:59:51 -06:00
unknown
f97de74c30 skip updates with the same server id as self
kill zombie COM_BINLOG_DUMP with the same server id on connect


sql/mysql_priv.h:
  made kill_one_thread global scope
sql/slave.cc:
  skip updates with the same server id as self
  fixed compiler warning
sql/sql_parse.cc:
  COM_BINLOG_DUMP is followed by a simulation of COM_QUIT for proper thread clean up
sql/sql_repl.cc:
  kill zombie COM_BINLOG_DUMP with the same server id on connect,
  more verbose binlog_send process status
2000-10-02 17:59:12 -06:00
unknown
d07d40e26b manual.texi Removed the @itemization of the MySQL books section.
manual.texi	Browsers don't like tables in <ul> lists. :(


Docs/manual.texi:
  Removed the @itemization of the MySQL books section.
  Browsers don't like tables in <ul> lists. :(
2000-10-02 18:49:00 -05:00
unknown
a9f2a439b4 fixed compile error 2000-10-01 22:52:36 -06:00
unknown
425252771b added sql_repl.* officially - fixing an oops - forgot to actually add
it earlier
2000-10-01 21:28:21 -06:00
unknown
b595ea8c2d Need to commit to be able to pull to be able to push to fix an oops
repl-tests/test-dump/run.test:
  increased wait for propogation
repl-tests/test-repl/run.test:
  increased wait for propogation
2000-10-01 21:26:29 -06:00
unknown
323905c1c3 manual.texi Added uklinux.net mirror.
Docs/manual.texi:
  Added uklinux.net mirror.
2000-09-30 20:29:40 -05:00
unknown
4f13048e1d Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2000-09-29 17:21:13 -06:00
unknown
e52e3167c7 bug fixes in server-id, moved replication functionality to
sql_repl.* will push this one, since the replication code now works


repl-tests/test-dump/run.test:
  added slave/master reset
sql/Makefile.am:
  added sql_repl.*
sql/log_event.cc:
  moved #defines to log_event.h
sql/log_event.h:
  moved #defines from log_event.cc
sql/mysql_priv.h:
  added LOCK_server_id
sql/mysqlbinlog.cc:
  added server id
sql/mysqld.cc:
  added mutex_init for LOCK_server_id
sql/slave.cc:
  added server_id to COM_BINLOG_DUMP
sql/sql_base.cc:
  moved replication code to sql_repl.*
sql/sql_parse.cc:
  moved replication code to sql_repl.*
2000-09-29 17:20:26 -06:00
unknown
9dc099e9e9 Handle compressed man/info docs. Thanks to GOMEZ Henri <hgomez@slib.fr>
for the patch.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-09-29 15:55:49 -04:00
unknown
e62748fb5f Handle compressed man/info docs. Thanks to
GOMEZ Henri <hgomez@slib.fr> for the patch.


support-files/mysql.spec.sh:
  handle compressed man/info docs
2000-09-29 15:54:54 -04:00
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