Commit graph

14904 commits

Author SHA1 Message Date
unknown
89ee326c1d Bug fix for NATURAL JOIN, Split manual sections and more statistic variables
Docs/manual.texi:
  Split BDB into different sections
  Added MySQL developers section
  Changed an SQL to a SQL
include/my_sys.h:
  More statistic variables
libmysql/libmysql.c:
  Added option "interactive-timeout"
mysys/mf_tempfile.c:
  More statistic variables
mysys/my_static.c:
  More statistic variables
sql-bench/crash-me.sh:
  Fixed bug in truncate table test
sql-bench/limits/mysql-3.23.cfg:
  Updated to crash-me 1.51
sql-bench/limits/mysql.cfg:
  Updated to crash-me 1.51
sql/filesort.cc:
  More statistics
sql/mysql_priv.h:
  More statistics
sql/mysqld.cc:
  More statistics
sql/sql_base.cc:
  Fix for NATURAL JOIN
sql/sql_delete.cc:
  cleanup + Added logging if one doesn't use index
sql/sql_parse.cc:
  Logging if one doesn't use index
sql/sql_select.cc:
  Logging if one doesn't use index
sql/sql_update.cc:
  cleanup + Added logging if one doesn't use index
sql/structs.h:
  Fix for NATURAL JOIN
support-files/my-huge.cnf.sh:
  Added interactive-timeout to [mysqlhotcopy]
support-files/my-large.cnf.sh:
  Added interactive-timeout to [mysqlhotcopy]
support-files/my-medium.cnf.sh:
  Added interactive-timeout to [mysqlhotcopy]
support-files/my-small.cnf.sh:
  Added interactive-timeout to [mysqlhotcopy]
2000-11-20 02:57:02 +02:00
unknown
22a61956da Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/src/mysql


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2000-11-19 22:27:46 +01:00
unknown
5dae19b394 Fixed some reported bugs
BUILD/compile-alpha-cxx:
  Building on Alpha with Compaq C and C+++
Docs/manual.texi:
  Changelogs and update of links
myisam/mi_key.c:
  Fixed multi_part keys where first part where of TEXT/BLOB type
mysys/Makefile.am:
  Makefile.am now works with Compaq make
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/test-select.sh:
  Made the count_distinct_big test a bit smaller
sql/log.cc:
  Changed the slow log format to have more information by default
sql/mysqld.cc:
  false->FALSE
sql/share/german/errmsg.sys:
  Update of messages
sql/share/german/errmsg.txt:
  Update of messages
sql/sql_base.cc:
  Fixed SELECT DISTINCT *
sql/sql_insert.cc:
  Cleanup
sql/sql_table.cc:
  Added logging of DROP of temporary tables
vio/VioFd.cc:
  false -> FALSE
vio/VioSSL.cc:
  false -> FALSE
vio/VioSSLFactoriesFd.cc:
  false -> FALSE
vio/VioSocket.cc:
  false -> FALSE
2000-11-18 23:13:48 +02:00
unknown
0cb89fb702 one more fix for Intvar 22 offset mystery bug
sql/slave.cc:
  mi->pending needed a reset in one more place
2000-11-17 23:55:22 -07:00
unknown
53ada89055 fixed bugs in delayed insert replication and when slave loses connection after Int_var but before Query
public test suite now tests replication code as well


mysql-test/mybin/mysql-test_install_db:
  fixes to test replication with two daemons on one machine
mysql-test/mysql-test-run:
  fixes for replication tests -- still need to test gcov, the rest works
mysql-test/t/include/master-slave.inc:
  include file for replication tests
sql/slave.cc:
  fixed bug for the case when the slave loses connection after it has read Int_var event but before Query
sql/sql_insert.cc:
  reset error in delayed thread
  slave converts delayed insert to regular
2000-11-17 23:35:40 -07:00
unknown
0ffa94682e Portability fixes
Docs/manual.texi:
  Updated links and added more examples
client/mysql.cc:
  Added --timeout + merge of Jani:s changes
isam/_dynrec.c:
  Fixed bug when making big rows 1 byte smaller
scripts/mysqlhotcopy.sh:
  Added regexp handling of filenames
sql-bench/test-insert.sh:
  More order by tests
sql/mf_iocache.cc:
  Cleanup
sql/mysqld.cc:
  Moved my_delete() to before master thread died
sql/sql_parse.cc:
  Fixed wrong comparison
2000-11-18 02:15:06 +02:00
unknown
19fc413aa2 Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
2000-11-17 14:39:26 +02:00
unknown
3f9c19dcf6 Fixed bug with text key compares in BDB
Docs/manual.texi:
  Updated statistics table
mysys/Makefile.am:
  Removed rule for getopt1.o
sql-bench/test-insert.sh:
  Enlarged some tests
sql/ha_berkeley.cc:
  Fixed bug with text key compares
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-17 14:38:53 +02:00
unknown
02e6c9634d fixed bugs in IO_CACHE and Load_event constructor. The code now passes
replication test suite


mysys/mf_iocache2.c:
  fixed bug in my_b_seek
sql/log_event.cc:
  fixed bug in Load_event constructor, removed compiler warnings
sql/mf_iocache.cc:
  _my_b_read could overflow a small buffer if the leftovers happened 
  to be more than we wanted to read. info->pos_in_file was also not
  being set correctly
2000-11-16 22:59:50 -07:00
unknown
3dc874a7c0 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
2000-11-16 17:53:22 -07:00
unknown
6e8c7df035 sql/log.cc
fixed bug in find_first_log
sql/mysqlbinlog.cc
    flose file only if we opened it
sql/slave.cc
    changed spacing
sql/sql_repl.cc
    fixed error message


sql/log.cc:
  fixed bug in find_first_log
sql/mysqlbinlog.cc:
  flose file only if we opened it
sql/slave.cc:
  changed spacing
sql/sql_repl.cc:
  fixed error message
BitKeeper/etc/ignore:
  Added repl-tests/test-repl/foo-dump-slave.master. repl-tests/test-repl/sum-wlen-slave.master. repl-tests/test-repl/sum-wlen-slave.master.re to the ignore list
2000-11-16 17:48:13 -07:00
unknown
8f906f7790 Fixes for bugs in the usage of IO_CACHE
Docs/manual.texi:
  Fixed the TRUNCATE syntax + Changelog
include/my_sys.h:
  Added my_b_vprintf
mysys/mf_iocache2.c:
  Added my_b_vprintf
mysys/my_vsnprintf.c:
  Fixed fatal (new) bug
mysys/thr_lock.c:
  Cleanup
readline/bind.c:
  cleanup
scripts/Makefile.am:
  Added mysqldumpslow
sql-bench/crash-me.sh:
  Fixed TRUNCATE
sql/log.cc:
  bug fix
sql/log_event.cc:
  Removed compiler warnings
sql/log_event.h:
  Fixed non portable header in binary dump
sql/mf_iocache.cc:
  cleanup
sql/mysqld.cc:
  Fixed loop problem on NT
sql/slave.cc:
  cleanup
sql/sql_class.cc:
  Fixed typos
sql/sql_parse.cc:
  cleanup
sql/sql_select.cc:
  bugfix
sql/sql_table.cc:
  cleanup
sql/sql_yacc.yy:
  Changed ALTER TABLE ... ORDER BY to get fewer warnings
sql/unireg.cc:
  cleanup
sql/unireg.h:
  Added missing define
2000-11-17 02:36:46 +02:00
unknown
24137ef261 merge
mysys/my_open.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-16 20:55:52 +02:00
unknown
2187c0c3f3 Fixes for IO_CACHE
Docs/manual.texi:
  Added information about 4.0
mysys/my_open.c:
  Fix for usage with IO_CACHE
sql/log.cc:
  Cleanup for IO_CACHE
sql/mysqld.cc:
  cleanup
sql/sql_class.cc:
  Fixed wrong defines
sql/sql_class.h:
  Fixed usage of SET TIMESTAMP=#
2000-11-16 20:47:28 +02:00
unknown
113fb0ffaa Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
2000-11-16 10:38:01 -07:00
unknown
4ddac2140d BUILD/compile-pentium-debug
make -j 2
mysys/my_open.c
    my_umask is better than 0 - we do not want 0000 files when my_open() is called with O_CREAT
sql/log.cc
    fixed up IO_CACHE to make replication work, not fully yet
sql/log_event.cc
    fixed up IO_CACHE


BUILD/compile-pentium-debug:
  make -j 2
BitKeeper/etc/ignore:
  Added repl-tests/test-repl/sum-wlen-slave.master.reje support-files/mysql-3.23.28-gamma.spec to the ignore list
mysys/my_open.c:
  my_umask is better than 0 - we do not want 0000 files when my_open() is called with O_CREAT
sql/log.cc:
  fixed up IO_CACHE to make replication work, not fully yet
sql/log_event.cc:
  fixed up IO_CACHE
2000-11-16 10:37:30 -07:00
unknown
b3839d8dab Merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-16 13:37:03 +01:00
unknown
6cff846123 item_func.cc bugfix - two fulltext indices were not working sometimes
sql/item_func.cc:
  bugfix - two fulltext indices were not working sometimes
2000-11-16 13:08:20 +01:00
unknown
f44a41f013 merged
sql/log_event.h:
  Auto merged
sql/mysqlbinlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_class.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto converge
2000-11-15 18:58:59 -07:00
unknown
3e6dac34cd changed to use IO_CACHE instead of FILE
Docs/manual.texi:
  Type fixes
myisam/mi_create.c:
  Fixed bug in update from different processes
myisam/mi_locking.c:
  Fixed bug in update from different processes
myisam/mi_open.c:
  Fixed bug in update from different processes
myisam/mi_search.c:
  Fixed bug in update from different processes
myisam/myisamdef.h:
  Fixed bug in update from different processes
mysys/Makefile.am:
  Added mf_iocache2.c
sql/log.cc:
  Changed to use IO_CACHE instead of FILE
sql/sql_class.h:
  Changed to use IO_CACHE instead of FILE
sql/sql_repl.cc:
  Changed to use IO_CACHE instead of FILE
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-16 03:58:58 +02:00
unknown
11b725d1a3 sql/slave.cc
fixed bug - mutex was not being released if master.info could not be read



sql/slave.cc:
   fixed bug - mutex was not being released if master.info could not be read
2000-11-15 16:12:11 -07:00
unknown
c7d2c59ceb merge
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
2000-11-16 00:24:11 +02:00
unknown
9a846a52ae changed to use IO_CACHE instead of FILE
BitKeeper/deleted/.del-mf_reccache.c:
  ***MISSING WEAVE***
Docs/manual.texi:
  Fix licence information + update changelog
client/mysqlimport.c:
  Fixed typo
client/sql_string.cc:
  Added support for IO_CACHE
client/sql_string.h:
  Added support for IO_CACHE
include/my_sys.h:
  More options for IO_CACHE
mysql.proj:
  Update
mysys/Makefile.am:
  Remoced mf_reccache.c
mysys/mf_cache.c:
  Fixed return value on error and optimzed used of write cache files
mysys/mf_iocache.c:
  More options for IO_CACHE
mysys/my_vsnprintf.c:
  Optimized code
sql/mf_iocache.cc:
  merge with mf_iocache.c
sql/net_pkg.cc:
  cleanup
sql/sql_class.cc:
  Support for transaction safe log files
sql/sql_string.cc:
  Added support for IO_CACHE
sql/sql_string.h:
  Added support for IO_CACHE
sql/time.cc:
  cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-15 23:00:06 +02:00
unknown
1ba95db25f ha_berkeley.cc fixed misleading comment
sql_parse.cc	typo when checking for autocommit


sql/sql_parse.cc:
  typo when checking for autocommit
sql/ha_berkeley.cc:
  fixed misleading comment
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-15 08:34:18 +01:00
unknown
3c82b81154 repl-tests/test-repl-ts/repl-timestamp.master.reject
this file needs to be deleted
sql/log_event.cc
    fixed warnings
sql/log_event.h
    fixed () #define bug
sql/mysqlbinlog.cc
    fixed length argument - was supposed to be one less
sql/mysqld.cc
    replicate-do/ignore-table now works, wild does not yet
sql/mysql_priv.h
    updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/slave.cc
    changes fore replicate-do/ignore-table
    close the socket before going to sleep sleeping after error
    bad event was being freed too early
sql/slave.h
    changes for replicate-do/ignore-table
sql/sql_class.cc
    slave_thread variable to THD
sql/sql_class.h
    added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc
    updating argument to add_tables_to_list()
sql/sql_table.cc
    fixed bug in mysql_rm_table()
sql/sql_yacc.yy
    fixed up add_table_to_list() calls to accept updating argument
sql/table.h
    added updating to TABLE_LIST


repl-tests/test-repl-ts/repl-timestamp.master.reject:
  this file needs to be deleted
sql/log_event.cc:
  fixed warnings
sql/log_event.h:
  fixed () #define bug
sql/mysql_priv.h:
  updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/mysqlbinlog.cc:
  fixed length argument - was supposed to be one less
sql/mysqld.cc:
  replicate-do/ignore-table now works, wild does not yet
sql/slave.cc:
  changes fore replicate-do/ignore-table
  close the socket before going to sleep sleeping after error
  bad event was being freed too early
sql/slave.h:
  changes for replicate-do/ignore-table
sql/sql_class.cc:
  slave_thread variable to THD
sql/sql_class.h:
  added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc:
  updating argument to add_tables_to_list()
sql/sql_table.cc:
  fixed bug in mysql_rm_table()
sql/sql_yacc.yy:
  fixed up add_table_to_list() calls to accept updating argument
sql/table.h:
  added updating to TABLE_LIST
2000-11-13 23:43:02 -07:00
unknown
f3d2341f1f Bug fixes, TRUNCATE, safer passwords on command line and connect timeout
Docs/manual.texi:
  Update of safe_mysqld, TRUNCATE and changes for 3.23.28
client/mysql.cc:
  Added --timeout
client/mysqladmin.c:
  Safer password handling
client/mysqldump.c:
  Safer password handling
client/mysqlimport.c:
  Safer password handling
client/mysqlshow.c:
  Safer password handling
configure.in:
  Fixes for Darwin and added test of poll
include/my_pthread.h:
  Fixes for darwin
include/violite.h:
  Added test for polling
libmysql/libmysql.c:
  connect timeout
libmysql/violite.c:
  connect timeout
mysys/hash.c:
  Fix when delting from empty table
scripts/safe_mysqld.sh:
  Added --open-files, --core-file-size and --timezone
sql-bench/bench-init.pl.sh:
  Function print_time
sql-bench/crash-me.sh:
  Added test of truncate
sql-bench/test-insert.sh:
  More "estimated" tests
sql-bench/test-select.sh:
  More "estimated" tests
sql/filesort.cc:
  Removed allocation of extra memory
sql/ha_berkeley.cc:
  Better estimation of number of rows
sql/item_create.cc:
  Truncate
sql/item_create.h:
  Truncate
sql/item_strfunc.cc:
  Removed usage of MY_FAE
sql/lex.h:
  Truncate
sql/lock.cc:
  Fixed possible loop bug
sql/log.cc:
  Removed usage of FILE:s
sql/mysqld.cc:
  Print of more server variables
sql/sql_class.h:
  Changed FILE -> File
sql/sql_insert.cc:
  Fixed bug in temptable handling
sql/sql_lex.h:
  Cleanup
sql/sql_load.cc:
  Removed usage of MY_FAE
sql/sql_parse.cc:
  Cleanup + TRUNCATE
sql/sql_select.cc:
  Cleanup + fix for INSERT ... SELECT
sql/sql_yacc.yy:
  TRUNCATE
sql/violite.c:
  Merge with client/violite.c
strings/strstr-sparc.s:
  Fixed wrong register usage
2000-11-13 23:55:10 +02:00
unknown
09b4480ed1 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
sql/mysql_priv.h:
  Auto merged
2000-11-11 23:27:23 -06:00
unknown
6bc9c92ecd laptop commit - bk wants me commit again!
sql/log_event.cc:
  added sanity check to catch partial event reads from the master
2000-11-11 15:04:00 -07:00
unknown
fd2c900e52 laptop commit
BUILD/compile-pentium-debug-no-bdb:
  forgot to install BDB on my laptop, needed to have this
sql/log.cc:
  fixed initialization warning
sql/sql_insert.cc:
  delayed insert was getting logged on failure. To make things worse,
  all delayed inserts were being logged with query_length=0
sql/sql_repl.cc:
  fixed compiler warnings
2000-11-11 14:57:35 -07:00
unknown
19d2e8ce98 laptop commit, syncing with the repostitory. Fixed some bad bugs in replication
BUILD/compile-pentium-debug:
  added -DEXTRA_DEBUG
sql/Makefile.am:
  added slave.h
sql/log_event.h:
  max_buf -> event_len in read_log_event
sql/mysql_priv.h:
  moved the slave part to slave.h
sql/mysqld.cc:
  changes for replcate_do/ignore_table ( does not work yet)
sql/slave.cc:
  removed the stuff covered by slave.h
sql/sql_class.h:
  moved slave stuff to slave.h
sql/sql_repl.h:
  removed stuff covered by slave.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-11 14:50:39 -07:00
unknown
cfe54ade6a Whoops, forgot to update sql/ChangeLog.
sql/ChangeLog:
  Whoops, forgot to update the ChangeLog.
2000-11-11 12:32:39 -06:00
unknown
c0f040274d Added ALTER TABLE ... ORDER BY ...
Docs/manual.texi:
  Added documentation for ALTER TABLE ... ORDER BY ...
sql/mysql_priv.h:
  Exported make_unireg_sortorder
  Exported setup_order
sql/sql_base.cc:
  Changes for ALTER TABLE ... ORDER BY ...
sql/sql_parse.cc:
  Changes for ALTER TABLE ... ORDER BY ...
sql/sql_select.cc:
  Moved make_unireg_sortorder and setup_order prototypes to
  mysql_priv.h and made them non-static so that they can be 
  used elsewhere.  Needed for ALTER TABLE ... ORDER BY ...
2000-11-11 12:27:34 -06:00
unknown
d3949f4c7d Changes to make ALTER TABLE and DELETE FROM TABLE work properly
with BEGIN WORK.
2000-11-07 01:52:43 -05:00
unknown
29375b48a3 Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work
2000-11-07 00:53:24 -05:00
unknown
c7fa60e542 sql_parse.cc test for changing to auto_commit mode was backwards
ha_berkeley.cc	bug fixes to make OPT_BEGIN work properly
handler.cc	bug fixes to make OPT_BEGIN work properly


sql/handler.cc:
  bug fixes to make OPT_BEGIN work properly
sql/ha_berkeley.cc:
  bug fixes to make OPT_BEGIN work properly
sql/sql_parse.cc:
  test for changing to auto_commit mode was backwards
2000-11-07 00:53:02 -05:00
unknown
a631f8ee12 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-11-06 19:42:21 -07:00
unknown
ae72872965 sql/item_strfunc.cc
fixed coredump in concat_ws
sql/item_strfunc.h
    fixed coredump in concat_ws
sql/mini_client.cc
    added mc_mysql_error()
sql/mini_client.h
    added mc_mysql_errno()
sql/mysqlbinlog.cc
    fixed bug in --postion for local files
sql/slave.cc
    more verbose message on bad net reads
sql/sql_repl.cc
    send errno on error in mysql_binlog_send


sql/item_strfunc.cc:
  fixed coredump in concat_ws
sql/item_strfunc.h:
  fixed coredump in concat_ws
sql/mini_client.cc:
  added mc_mysql_error()
sql/mini_client.h:
  added mc_mysql_errno()
sql/mysqlbinlog.cc:
  fixed bug in --postion for local files
BitKeeper/etc/ignore:
  Added client/.mysqladmin.c.swp to the ignore list
sql/slave.cc:
  more verbose message on bad net reads
sql/sql_repl.cc:
  send errno on error in mysql_binlog_send
2000-11-06 19:39:13 -07:00
unknown
6cffc526b5 Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-06 11:13:40 -05:00
unknown
e07aa7950e BitKeeper/triggers/post-commit
send the diffs
Docs/manual.texi
    updated change history
include/my_sys.h
    Moved safemalloc_mem_limit here
mysys/safemalloc.c
    fixed up safemalloc_mem_limit
sql/mysqld.cc
    moved safemalloc_mem_limit declaration to my_sys.h


BitKeeper/triggers/post-commit:
  send the diffs
Docs/manual.texi:
  updated change history
include/my_sys.h:
  Moved safemalloc_mem_limit here
mysys/safemalloc.c:
  fixed up safemalloc_mem_limit
sql/mysqld.cc:
  moved safemalloc_mem_limit declaration to my_sys.h
2000-11-04 21:00:41 -07:00
unknown
ccc273c6a6 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge
2000-11-04 20:21:22 -07:00
unknown
ee972a4d9f fix for FLUSH TABLES WITH READ LOCK 2000-11-04 13:58:07 -07:00
unknown
2122fc2603 fixed bug with FULLTEXT and ORDER BY
include/ft_global.h:
  fixed bug with ORDER BY
sql/ha_myisam.cc:
  fixed bug with ORDER BY
sql/item_func.cc:
  fixed bug with ORDER BY
sql/item_func.h:
  fixed bug with ORDER BY
sql/sql_select.cc:
  fixed bug with ORDER BY
2000-11-04 15:48:06 +01:00
unknown
745f1197f6 sql/slave.cc
mutex now initialized in the constructor
sql/sql_class.h
    intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc
    fixed typo in error message
    if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
repl-tests/test-repl-ts/repl-timestamp.master.reject
    New BitKeeper file ``repl-tests/test-repl-ts/repl-timestamp.master.reject''


BitKeeper/etc/ignore:
  Added repl-tests/test-repl-ts/repl-timestamp.master.reject to the ignore list
sql/slave.cc:
  mutex now initialized in the constructor
sql/sql_class.h:
  intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc:
  fixed typo in error message
  if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
2000-11-03 19:31:22 -07:00
unknown
10f9d35479 Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged
2000-11-03 14:53:43 -05:00
unknown
a1b03526fc fixed bugs in elt() and make_set()
added two new test cases


BitKeeper/etc/ignore:
  Added mysql-test/r/3.23/sel000004.result.reject mysql-test/var/lib/mysql-bin.006 mysql-test/var/lib/test/elt_ck1.frm mysql-test/var/lib/test/elt_ck1.MYD mysql-test/var/lib/test/elt_ck1.MYI mysql-test/var/lib/test/elt_ck2.frm mysql-test/var/lib/test/elt_ck2.MYD mysql-test/var/lib/test/elt_ck2.MYI to the ignore list
mysql-test/r/3.23/sel000004.result:
  new result
mysql-test/r/3.23/sel000005.result:
  new result
sql/item_strfunc.cc:
  fixed bug in make_set() and elt()
2000-11-03 07:04:33 -07:00
unknown
e735267f69 Ill-minded FULLTEXT impilict initialization hack removed.
From now on FULLTEXT search is initialized expilictly in mysql_select()


sql/item_func.cc:
  FULLTEXT expilict initialization
sql/opt_ft.h:
  FULLTEXT expilict initialization
sql/opt_range.h:
  FULLTEXT expilict initialization
sql/ha_myisam.cc:
  FULLTEXT expilict initialization
sql/ha_myisam.h:
  FULLTEXT expilict initialization
sql/handler.h:
  FULLTEXT expilict initialization
sql/item_func.h:
  FULLTEXT expilict initialization
sql/sql_select.cc:
  FULLTEXT expilict initialization
myisam/ft_search.c:
  FULLTEXT expilict initialization
2000-11-02 17:36:21 +01:00
unknown
dbd04cab86 Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2000-10-30 21:50:43 -05:00
unknown
5d1d3b31a6 sql_parse.cc add send_ok() for BEGIN WORK
sql_yacc.yy	SQLCOM_COMMIT => SQLCOM_BEGIN for BEGIN_SYM


sql/sql_yacc.yy:
  SQLCOM_COMMIT => SQLCOM_BEGIN for BEGIN_SYM
sql/sql_parse.cc:
  add send_ok() for BEGIN WORK
2000-10-30 21:50:15 -05:00
unknown
3dfc0a825e libmysql/libmysql.c
keep vio from being freed twice when we are low on memory
mysys/safemalloc.c
    changes for --safemalloc-mem-limit
sql/mini_client.cc
    keep vio from being freed twice
sql/mysqld.cc
    changes for --safemalloc-mem-limit
sql/slave.cc
    prevent closing connection twice
sql/sql_string.h
    shrink() did not work right when my_realloc() failed


BitKeeper/etc/ignore:
  Added .gdb_history to the ignore list
libmysql/libmysql.c:
  keep vio from being freed twice when we are low on memory
mysys/safemalloc.c:
  changes for --safemalloc-mem-limit
sql/mini_client.cc:
  keep vio from being freed twice
sql/mysqld.cc:
  changes for --safemalloc-mem-limit
sql/slave.cc:
  prevent closing connection twice
sql/sql_string.h:
  shrink() did not work right when my_realloc() failed
2000-10-28 23:26:48 -06:00
unknown
9e1257059d mysys/mf_format.c
workaround for SCO realpath() bug
sql/slave.cc
    fixed memory leak when slave runs bad query


mysys/mf_format.c:
  workaround for SCO realpath() bug
sql/slave.cc:
  fixed memory leak when slave runs bad query
2000-10-28 14:38:09 -06:00