Commit graph

520 commits

Author SHA1 Message Date
unknown
3bd0819a91 merge of lost change
mysql-test/r/keywords.result:
  merged lost change back
2001-10-24 11:52:19 -06:00
unknown
aba008d6b3 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-10-23 13:28:47 -06:00
unknown
8fc78e08b0 cleanup
removal of duplicate code in mf_iocache.cc 
work on failsafe replication
work on SEQ_READ_APPEND io cache


include/my_sys.h:
  updates for SEQ_READ_APPEND
libmysql/Makefile.am:
  fix for mysys/mf_iocache.c
libmysql/libmysql.c:
  updates for new format of SHOW SLAVE HOSTS
mysql-test/r/rpl000001.result:
  test replication of LOAD DATA LOCAL INFILE
mysql-test/r/rpl000002.result:
  updated test result
mysql-test/t/rpl000001.test:
  test LOAD DATA LOCAL INFILE
mysys/mf_iocache.c:
  cleanup to remove duplicate functionality
  some work on SEQ_READ_APPEND
sql/mf_iocache.cc:
  cleanup to remove duplicate functionality
sql/repl_failsafe.cc:
  more work on failsafe replication
sql/repl_failsafe.h:
  more work on failsafe replication
sql/slave.cc:
  cleanup
  more work on failsafe replication
sql/sql_load.cc:
  fixed bug on replicating empty file loads
  got LOAD DATA LOCAL INFILE to work again, and to be replicated
sql/sql_repl.cc:
  cleanup
  more work on failsafe replication
sql/sql_repl.h:
  more work on failsafe replication
2001-10-23 13:28:03 -06:00
unknown
d0ea7a53c9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/item_func.h:
  Auto merged
2001-10-22 11:57:48 +02:00
unknown
b09eb95869 two bugs in ft_update
myisam/ft_update.c:
  two bugfixes
mysql-test/r/fulltext.result:
  new tests
mysql-test/t/fulltext.test:
  new tests
2001-10-20 16:37:26 +02:00
unknown
440de598ee Update test results after merge
mysql-test/r/join_outer.result:
  Update test results
mysql-test/r/null.result:
  Update test results
2001-10-20 11:56:49 +03:00
unknown
c31859900e merge
Docs/manual.texi:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/slave.cc:
  keep local copy
2001-10-20 10:27:01 +02:00
unknown
253b9ecb11 Don't use signal() on windows.
Added missing InnoDB variables to SHOW VARIABLES.
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'


Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Don't use signal() on windows.
mysql-test/r/join_outer.result:
  Test for bugfix
mysql-test/r/null.result:
  Test for bugfix
mysql-test/t/join_outer.test:
  Test for bugfix
mysql-test/t/null.test:
  Test for bugfix
sql/mysqld.cc:
  Add missing InnoDB variables to SHOW VARIABLES.
sql/sql_select.cc:
  Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
  Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'
2001-10-19 22:10:54 +03:00
unknown
dd5f9b4a4f ./mysql-test-run --gdb 2001-10-18 15:45:33 +02:00
unknown
83ba8a138f typo fixed
mysql-test/r/fulltext.result:
  new test
mysql-test/t/fulltext.test:
  new test
2001-10-17 14:49:54 +02:00
unknown
4ebea90960 make mysql-test-run --gdb to work (as it does not wait for keypress anymore)
manual updated


mysql-test/t/fulltext_update.test:
  Change mode to -rw-rw-r--
Docs/manual.texi:
  updated
mysql-test/mysql-test-run.sh:
  make --gdb to work (as mysql-test-run does not wait for keypress anymore)
2001-10-15 18:27:12 +02:00
unknown
b28bfc7a26 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
2001-10-13 09:29:32 -06:00
unknown
5c1dbfe6a7 64-bit portability fixes in network I/O
use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux


client/mysqltest.c:
  added MAX_TABLES variable
libmysql/libmysql.c:
  portability fixes for 64-bit systems
mysql-test/mysql-test-run.sh:
  fixed bug - wrong values of -display in xterm in gdb mode
mysql-test/r/join.result:
  make test work on both 32-bit and 64-bit systems
mysql-test/t/join.test:
  make test work on both 32-bit and 64-bit systems
sql/mini_client.cc:
  64-bit portability fixes
sql/mini_client.h:
  64-bit portability fixes
sql/slave.cc:
  64-bit portability fixes
tools/mysqlmanager.c:
  64-bit portability fixes
2001-10-13 09:28:35 -06:00
unknown
0c2d19b5b5 mysql-test/r/fulltext*.result updated
mysql-test/r/fulltext_cache.result:
  fixed
mysql-test/r/fulltext_left_join.result:
  fixed
mysql-test/r/fulltext_multi.result:
  fixed
mysql-test/r/fulltext_order_by.result:
  fixed
2001-10-12 19:10:11 +02:00
unknown
6db2120514 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/fulltext_order_by.result:
  Auto merged
mysql-test/r/fulltext_multi.result:
  Auto merged
mysql-test/r/fulltext_cache.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/r/fulltext_left_join.result:
  Auto merged
sql/handler.h:
  Auto merged
2001-10-12 17:47:13 +02:00
unknown
a6c5867683 changed manager to use my_net_*
fixed bug in master - unregister slaves when they disconnect


client/mysqlmanagerc.c:
  changed default port
include/mysql.h:
  use my_net_*
libmysql/manager.c:
  use my_net_*
mysql-test/mysql-test-run.sh:
  added support for client strace
sql/sql_parse.cc:
  unregister slaves on disconnect
sql/sql_repl.cc:
  unregister slaves on disconnect
sql/sql_repl.h:
  unregister slaves on disconnect
tools/mysqlmanager.c:
  changed to use my_net_*
2001-10-12 09:37:25 -06:00
unknown
be31ffa2e4 Manual cleanups
mysql-test/mysql-test-run.sh:
  Make it default to not use the MySQL manager (until next MySQL release)
2001-10-12 00:41:31 +03:00
unknown
d34950e8d2 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/r/rpl_failsafe.result:
  Auto merged
mysql-test/t/rpl_failsafe.test:
  Auto merged
mysql-test/t/rpl000018.test:
  Auto merged
2001-10-11 13:55:29 -06:00
unknown
56303b0383 fixes for mysql-test to run without manager
a bit more work on failsafe replication


client/mysqltest.c:
  added require_manager support
mysql-test/mysql-test-run.sh:
  added --no-manager
mysql-test/r/rpl_failsafe.result:
  updated result
mysql-test/t/rpl000018.test:
  must have manager
mysql-test/t/rpl_failsafe.test:
  must have manager
sql/repl_failsafe.cc:
  more work
sql/repl_failsafe.h:
  more work
sql/slave.cc:
  update replication status for fail-safe replication on different events
2001-10-11 13:54:06 -06:00
unknown
239e8da926 Merge serg.mysql.com:/usr/home/serg/Abk/mysql-4.0-newft
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-11 18:47:22 +02:00
unknown
54f02d3263 misc. fulltext staff
myisam/ft_boolean_search.c:
  Fixed bug
mysql-test/r/fulltext.result:
  updated for new mysqltest
mysql-test/t/fulltext.test:
  duplicate removed
2001-10-11 18:46:35 +02:00
unknown
6f2d56162b InnoDB portability fixes
innobase/configure.in:
  Remove LOCALTIME_R (Already checked in config.h)
innobase/os/os0file.c:
  Fix syntax bug when using HAVE_PREAD/HAVE_PWRITE
mysql-test/r/innodb.result:
  Update results
2001-10-11 12:49:44 +03:00
unknown
7b4549e6a0 Added missing files in libmysqld and the RPM spec file
Docs/manual.texi:
  Added info to foreign key section.
BitKeeper/etc/ignore:
  Added libmysqld/repl_failsafe.cc to the ignore list
libmysqld/Makefile.am:
  Added missing files
mysql-test/r/innodb.result:
  Fixed explain results after new innodb optimizations
support-files/mysql.spec.sh:
  Added missing files
2001-10-11 05:37:05 +03:00
unknown
6b648e4b13 got the last changeset to compile/run
mysqltest can run without connecting to the manager for tests that do not 
require manager operations


client/mysqltest.c:
  make mysqltest work without having to connect to the manager
mysql-test/mysql-test-run.sh:
  init-rpl-role option to servers
  pass manager-host to mysqltest
mysql-test/r/rpl_failsafe.result:
  updated result
mysql-test/t/rpl_failsafe.test:
  check for Rpl_status
sql/mysqld.cc:
  fixed bad merge
sql/repl_failsafe.cc:
  fixed bug
sql/repl_failsafe.h:
  fixed compile error
sql/sql_show.cc:
  fixed compile error
2001-10-10 15:36:35 -06:00
unknown
c20a4e6e02 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


include/my_global.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2001-10-10 18:22:14 +02:00
unknown
b9578dba1f merged
sql/Makefile.am:
  Auto merged
2001-10-09 20:59:42 -06:00
unknown
8cbba4051f Remved Gemini code.
BitKeeper/deleted/.del-ha_gemini.cc~5d72172d33b00c6:
  Delete: sql/ha_gemini.cc
BitKeeper/deleted/.del-ha_gemini.h~4dfccf1929195747:
  Delete: sql/ha_gemini.h
BitKeeper/deleted/.del-gemini.result~89b4f9cced8dfc2f:
  Delete: mysql-test/r/gemini.result
BitKeeper/deleted/.del-gemini.test~51d0362310e55e17:
  Delete: mysql-test/t/gemini.test
BitKeeper/deleted/.del-have_gemini.inc~42f94f0dfd0f7b18:
  Delete: mysql-test/include/have_gemini.inc
BitKeeper/deleted/.del-have_gemini.require~206702c48b2e206b:
  Delete: mysql-test/r/have_gemini.require
BitKeeper/deleted/.del-gemini.dat~a73393a88b124b9f:
  Delete: mysql-test/std_data/gemini.dat
BitKeeper/deleted/.del-isolation.test~6a39e4138dd4a456:
  Delete: mysql-test/t/isolation.test
BitKeeper/deleted/.del-isolation.result~4da11e109a3d93a9:
  Delete: mysql-test/r/isolation.result
acinclude.m4:
  Remved gemini code.
configure.in:
  Remved gemini code.
libmysql/libmysql.c:
  Remved gemini code.
mysql-test/install_test_db.sh:
  Remved gemini code.
scripts/mysql_install_db.sh:
  Remved gemini code.
sql/Makefile.am:
  Remved gemini code.
sql/field.cc:
  Remved gemini code.
sql/field.h:
  Remved gemini code.
sql/handler.cc:
  Remved gemini code.
sql/handler.h:
  Remved gemini code.
sql/lex.h:
  Remved gemini code.
sql/mysqld.cc:
  Remved gemini code.
sql/sql_base.cc:
  Remved gemini code.
sql/sql_class.cc:
  Remved gemini code.
sql/sql_class.h:
  Remved gemini code.
sql/sql_lex.h:
  Remved gemini code.
sql/sql_parse.cc:
  Remved gemini code.
sql/sql_rename.cc:
  Remved gemini code.
sql/sql_table.cc:
  Remved gemini code.
sql/sql_yacc.yy:
  Remved gemini code.
2001-10-10 02:50:28 +03:00
unknown
8b209415ff support for three slaves in mysql-test
mysql-test/mysql-test-run.sh:
  start three slaves in failover test
mysql-test/r/rpl_failsafe.result:
  check two more slaves
mysql-test/t/rpl_failsafe.test:
  check two more slaves
2001-10-09 16:43:05 -06:00
unknown
a0ed9744f3 merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-ft_search.c~c011cb6e8041bb59:
  the file is deleted anyway
include/my_global.h:
  merder
myisam/ft_boolean_search.c:
  huh?
mysql-test/r/fulltext.result:
  use local
mysql-test/r/fulltext_cache.result:
  ur
mysql-test/r/fulltext_left_join.result:
  ur
mysql-test/r/fulltext_multi.result:
  ur
mysql-test/r/fulltext_order_by.result:
  ur
2001-10-09 16:01:06 +02:00
unknown
c561a6f2a6 Sorry, forgot to update fulltext.result
mysql-test/r/fulltext.result:
  new tests added
2001-10-09 15:16:21 +02:00
unknown
736e5b0de2 Boolean search passes _some_ tests
sql/ha_myisam.cc:
  One more abstraction layer added (C++ emulated in C :).
include/ft_global.h:
  boolean search code plugged in
mysql-test/r/fulltext_cache.result:
  boolean search code plugged in
mysql-test/r/fulltext_left_join.result:
  boolean search code plugged in
mysql-test/r/fulltext_multi.result:
  boolean search code plugged in
mysql-test/r/fulltext_order_by.result:
  boolean search code plugged in
sql/lex.h:
  IN BOOLEAN MODE syntax
myisam/ft_nlq_search.c:
  boolean search code plugged in
myisam/ftdefs.h:
  boolean search code plugged in
sql/ha_myisam.h:
  boolean search code plugged in
sql/handler.h:
  boolean search code plugged in
include/my_base.h:
  do_not_sort_keyseg feature for MyISAM
include/my_global.h:
  #define comp(a,b) (((a) < (b)) ? -1 : ((a) > (b)) ? 1 : 0)
myisam/ft_boolean_search.c:
  bugfixing
myisam/ft_parser.c:
  cleanup
myisam/ft_static.c:
  do_not_sort_keyseg feature for MyISAM
myisam/mi_search.c:
  do_not_sort_keyseg feature for MyISAM
myisam/mi_write.c:
  cleanup
mysql-test/t/fulltext.test:
  boolean search tests added
BitKeeper/etc/ignore:
  Added myisam/FT1.MYD myisam/FT1.MYI to the ignore list
sql/item_func.cc:
  boolean search
sql/item_func.h:
  boolean search
sql/sql_yacc.yy:
  boolean search
2001-10-09 14:53:54 +02:00
unknown
a64d1ddfcc fixed error messages
mysql-test/r/drop.result:
  error msg fix
mysql-test/r/err000001.result:
  error msg fix
mysql-test/r/innodb.result:
  error msg fix
mysql-test/r/overflow.result:
  error msg fix
2001-10-08 20:18:37 -06:00
unknown
9820d3bd7c Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-10-08 13:49:47 -06:00
unknown
9fe894f9ca groundbreaking on fail-safe replication - added a token feature to have an
excuse to have a test case. Mental trick to get things moving faster...


mysql-test/mysql-test-run.sh:
  recovery rank
sql/mysqld.cc:
  recovery rank
2001-10-08 13:07:50 -06:00
unknown
2ee21c9c46 Cleanup after last merge
client/mysqltest.c:
  Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
  Made error messages more general
libmysqld/Makefile.am:
  md5 is now in mysys
mysql-test/include/have_isam.inc:
  Update to new result format
mysql-test/include/not_embedded.inc:
  Update to new result format
mysql-test/mysql-test-run.sh:
  Update to new result format
mysql-test/r/auto_increment.result:
  Update to new result format
mysql-test/r/count_distinct2.result:
  Update to new result format
mysql-test/r/create.result:
  Update to new result format
mysql-test/r/func_system.result:
  Update to new result format
mysql-test/r/isam.result:
  Update to new result format
mysql-test/r/lock.result:
  Update to new result format
mysql-test/r/lock_multi.result:
  Update to new result format
mysql-test/r/rename.result:
  Update to new result format
mysql-test/r/rpl000001.result:
  Fix wrong test
mysql-test/r/tablelock.result:
  Update to new result format
mysql-test/t/rename.test:
  Update to new result format
sql/share/czech/errmsg.txt:
  Made error messages more general
sql/share/danish/errmsg.txt:
  Made error messages more general
sql/share/dutch/errmsg.txt:
  Made error messages more general
sql/share/english/errmsg.txt:
  Made error messages more general
sql/share/estonian/errmsg.txt:
  Made error messages more general
sql/share/french/errmsg.txt:
  Made error messages more general
sql/share/german/errmsg.txt:
  Made error messages more general
sql/share/greek/errmsg.txt:
  Made error messages more general
sql/share/hungarian/errmsg.txt:
  Made error messages more general
sql/share/italian/errmsg.txt:
  Made error messages more general
sql/share/japanese/errmsg.txt:
  Made error messages more general
sql/share/korean/errmsg.txt:
  Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
  Made error messages more general
sql/share/norwegian/errmsg.txt:
  Made error messages more general
sql/share/polish/errmsg.txt:
  Made error messages more general
sql/share/portuguese/errmsg.txt:
  Made error messages more general
sql/share/romanian/errmsg.txt:
  Made error messages more general
sql/share/russian/errmsg.txt:
  Made error messages more general
sql/share/slovak/errmsg.txt:
  Made error messages more general
sql/share/spanish/errmsg.txt:
  Made error messages more general
sql/share/swedish/errmsg.txt:
  Made error messages more general
sql/share/ukrainian/errmsg.txt:
  Made error messages more general
sql/sql_lex.cc:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
  Cleanup
support-files/mysql.spec.sh:
  Create MySQL-embedded rpm
tools/mysqlmanager.c:
  Fix bug in merge
2001-10-08 07:24:04 +03:00
unknown
515c747dcf merge
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
libmysqld/Makefile.am:
  Added back md5.c
2001-10-08 05:36:35 +03:00
unknown
cef1d75249 Updated manual about embedded version.
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86


BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7:
  Delete: mysys/mf_pack2.c
Docs/manual.texi:
  Updated chapter about embedded version
acinclude.m4:
  Fix for using BDB and InnoDB with embedded
client/completion_hash.cc:
  Speed up memory allocation
client/completion_hash.h:
  Speed up memory allocation
client/mysql.cc:
  Speed up memory allocation
client/mysqldump.c:
  Fix to use now convert_dirname
client/mysqltest.c:
  Fixed memory allocation bugs.
  Added --basedir=#, --compress=#, --server-arg, --server-file.
  Fixes for embedded version
  Changed silent mode to -s instead of -q
include/my_global.h:
  Update to use HAVE_ISAM
include/my_sys.h:
  Cleanup of fn_format()
include/mysql.h:
  Prepare FIELD struct for 4.1
include/mysql_embed.h:
  Don't use ISAM in embedded version
innobase/include/srv0srv.h:
  Make InnoDB startup/shutdown silent in embedded version
innobase/log/log0log.c:
  Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0srv.c:
  Make InnoDB startup/shutdown silent in embedded version
innobase/srv/srv0start.c:
  Make InnoDB startup/shutdown silent in embedded version
isam/isamlog.c:
  new convert_dirname
libmysql/libmysql.c:
  Prepare for 4.1
libmysqld/Makefile.am:
  Changed to create one libmysqld.a file that includes all other libraries.
libmysqld/examples/Makefile.am:
  Changed to use new libmysqld.a
libmysqld/examples/test-run:
  Lot's of fixes to get new mysqltest with embedded MySQL to work.
libmysqld/lib_sql.cc:
  Changed type of arguments for mysql_server_init() to make code more portable.
libmysqld/libmysqld.c:
  Cleanup
merge/Makefile.am:
  Rename to use common prefix.
merge/mrg_close.c:
  Rename to use common prefix.
merge/mrg_create.c:
  Rename to use common prefix.
merge/mrg_def.h:
  Rename to use common prefix.
merge/mrg_delete.c:
  Rename to use common prefix.
merge/mrg_extra.c:
  Rename to use common prefix.
merge/mrg_info.c:
  Rename to use common prefix.
merge/mrg_locking.c:
  Rename to use common prefix.
merge/mrg_open.c:
  Rename to use common prefix.
merge/mrg_panic.c:
  Rename to use common prefix.
merge/mrg_rrnd.c:
  Rename to use common prefix.
merge/mrg_rsame.c:
  Rename to use common prefix.
merge/mrg_static.c:
  Rename to use common prefix.
merge/mrg_update.c:
  Rename to use common prefix.
myisam/myisamlog.c:
  Use new convert_dirname
myisammrg/Makefile.am:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_close.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_create.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_def.h:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_delete.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_extra.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_info.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_locking.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_open.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_panic.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_queue.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rfirst.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rkey.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rlast.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rnext.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rprev.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rrnd.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_rsame.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_static.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_update.c:
  Renamed mymrgdef.h -> myrg_def.h
myisammrg/myrg_write.c:
  Renamed mymrgdef.h -> myrg_def.h
mysql-test/include/master-slave.inc:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/mysql-test-run.sh:
  cleanup
mysql-test/r/auto_increment.result:
  Cleanup of tests for embedded version
mysql-test/r/func_system.result:
  Cleanup of tests for embedded version
mysql-test/r/isam.result:
  Cleanup of tests for embedded version
mysql-test/r/lock.result:
  Cleanup of tests for embedded version
mysql-test/r/show_check.result:
  Cleanup of tests for embedded version
mysql-test/t/auto_increment.test:
  Cleanup of tests for embedded version
mysql-test/t/backup.test:
  Cleanup of tests for embedded version
mysql-test/t/count_distinct2-master.opt:
  Cleanup of tests for embedded version
mysql-test/t/count_distinct2.test:
  Cleanup of tests for embedded version
mysql-test/t/create.test:
  Cleanup of tests for embedded version
mysql-test/t/flush.test:
  Cleanup of tests for embedded version
mysql-test/t/func_system.test:
  Cleanup of tests for embedded version
mysql-test/t/isam.test:
  Cleanup of tests for embedded version
mysql-test/t/kill.test:
  Cleanup of tests for embedded version
mysql-test/t/lock.test:
  Cleanup of tests for embedded version
mysql-test/t/order_fill_sortbuf-master.opt:
  Cleanup of tests for embedded version
mysql-test/t/rpl000015.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000016.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000017.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/rpl000018.test:
  Use short filenames for sockets (portability problem on Mac OS X)
mysql-test/t/show_check.test:
  Move ISAM specific tests to isam.test
mysql-test/t/status.test:
  Cleanup of tests for embedded version
mysql-test/t/tablelock.test:
  Cleanup
mysys/Makefile.am:
  Removed not used mf_pack2.c
mysys/charset.c:
  new convert_dirname
mysys/default.c:
  new convert_dirname
mysys/mf_dirname.c:
  Changed convert_dirname() to be more general
mysys/mf_format.c:
  Changed bit flags to fn_format() to defines.
  Added handling of relative filenames
BitKeeper/etc/ignore:
  Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list
mysys/mf_pack.c:
  new convert_dirname
mysys/mf_tempfile.c:
  new convert_dirname
scripts/Makefile.am:
  Adde mysql_explain_log
scripts/mysql_config.sh:
  Added support of --libmysqld-libs
sql/Makefile.am:
  Fix to use 'innodb_system_libs'
sql/ha_innobase.cc:
  Make InnoDB startup/shutdown silent in embedded version
sql/ha_isam.cc:
  Added handling of HAVE_ISAM
sql/ha_isammrg.cc:
  Added handling of HAVE_ISAM
sql/ha_myisam.cc:
  Handle relative paths;  Needed to support BACKUP TABLE in embedded version
sql/ha_myisammrg.cc:
  Rename of filenames
sql/handler.cc:
  Added handling of HAVE_ISAM
sql/item_func.cc:
  Fix for ecc (Intel Compiler)
sql/mysql_priv.h:
  Added global variable 'mysql_embedded'
sql/mysqld.cc:
  Use HAVE_ISAM
sql/sql_parse.cc:
  Use new convert_dirname
sql/sql_select.cc:
  Fix for ecc (Intel Compiler)
sql/sql_table.cc:
  Added handling of relative filenames
strings/Makefile.am:
  Don't compile both assembler and C functions on x86
strings/bchange.c:
  cleanup
2001-10-08 04:58:07 +03:00
unknown
63c7276f36 Fix for 'mysqladmin -w1 unknown-command'
Manual Changelog update


Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Fix for 'mysqladmin -w1 unknown-command'
libmysql/violite.c:
  Fix for TCP_NODELAY
mysql-test/mysql-test-run.sh:
  Portability fixes
sql/sql_lex.cc:
  Cleanup
sql/sql_lex.h:
  Cleanup
2001-10-07 14:18:09 +03:00
unknown
d0fe5ce1c7 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/rpl000017.test:
  Auto merged
sql/slave.cc:
  Auto merged
2001-10-07 12:26:03 +02:00
unknown
9def70036f fixed crash on slave when master aborts a query that has % in it.
mysql-test/t/rpl000001.test:
  test for coredump on slave while trying to print aborted query
sql/slave.cc:
  do not coredump printing aborted query if it has % in it.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-10-05 13:18:18 -06:00
unknown
07cb4e93aa fixed bug in SSL code
updated results - now ready to push


mysql-test/r/rpl000017.result:
  fix for new test format
mysql-test/r/type_enum.result:
  updated result
sql/mysqld.cc:
  fixed freeing NULL pointer
2001-10-04 16:45:35 -06:00
unknown
89055361b9 Merge
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
acinclude.m4:
  SCCS merged
2001-10-04 15:46:04 -06:00
unknown
5ee900d38a changes to make things work in the max version
acinclude.m4:
  automatically detect installation paths of OpenSSL instead of hard-coding
  automatically enable --with-vio if --with-openssl is enabled
client/mysqltest.c:
  fixes for embedded library
libmysqld/Makefile.am:
  md5 is now in mysys
libmysqld/libmysqld.c:
  added my_connect(), but now can be removed - will do in the next
  changeset
mysql-test/include/have_bdb.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_gemini.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_innodb.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl_1.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/include/have_openssl_2.inc:
  disable query log so that result file will not have unneeded 
  show variables
mysql-test/r/bdb.result:
  fix for new format
mysql-test/r/have_openssl.require:
  ssl->openssl
mysql-test/r/innodb.result:
  fix for query logging
2001-10-04 15:42:25 -06:00
unknown
bd7b4aaa7d New script: explain_log.sh
Portability fixes.
Handle cleanup when we get an error before the message file is read.
Fix bug in multi-table delete


include/mysql.h:
  Portability fix
mysql-test/mysql-test-run.sh:
  Don't use long names for sockets (portability fix)
sql/derror.cc:
  Better cleanup
sql/mysqld.cc:
  Fix that --enable-locking works.
  Handle case when we get an error before the message file is read
sql/sql_delete.cc:
  Fix bug in multi-table delete
sql/sql_select.cc:
  Fix bug in multi-table delete
sql/table.h:
  Fix bug in multi-table delete
tools/mysqlmanager.c:
  Portability fixes
2001-10-04 21:52:41 +03:00
unknown
aff3b0e4ad Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2001-10-04 02:44:54 +03:00
unknown
b39f54aafb Fixed some build problems.
Fix that compressed packets and normal packets looks indentical before calling net_real_write()
(Needed for query cache)
Optimize IS NULL handling


Build-tools/Do-compile:
  Fix for machines with clocks in an earlier timezone
Docs/manual.texi:
  Fixed typo
acinclude.m4:
  Fixed typo
client/mysqlbinlog.cc:
  Cleanup
client/mysqltest.c:
  Added --compress to test the compressed protocol
configure.in:
  Increment shared library number (because structs changed)
include/mysql.h:
  Optimize structs for Ia64
include/mysql_com.h:
  Optimize structs for Ia64
libmysql/libmysql.c:
  Portability fixes
libmysql/net.c:
  Fix that compressed packets and normal packets looks indentical before calling net_real_write()
  (Needed for query cache)
libmysqld/examples/Makefile.am:
  Portability fix
libmysqld/libmysqld.c:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Added --compress to test the compressed protocol
mysql-test/t/type_enum.test:
  A
mysys/mf_casecnv.c:
  Portability fixes
mysys/mf_tempfile.c:
  Portability fixes
scripts/make_binary_distribution.sh:
  Add libmysqld to binary distribution
sql-bench/server-cfg.sh:
  Fix for Interbase
sql/item.h:
  Optimize IS NULL handling
sql/item_cmpfunc.cc:
  Optimize IS NULL handling
sql/item_cmpfunc.h:
  Optimize IS NULL handling
sql/item_func.cc:
  cleanup
sql/item_func.h:
  Optimize IS NULL handling
sql/mysql_priv.h:
  c
sql/net_serv.cc:
  Fix that compressed packets and normal packets looks indentical before calling net_real_write()
  (Needed for query cache)
2001-10-04 02:44:18 +03:00
unknown
6dcd03d76c post-merge fixes
mysql-test/fix-result:
  version update
mysql-test/r/bigint.result:
  post-merge fix
mysql-test/r/join.result:
  post-merge fix
mysql-test/r/merge.result:
  post-merge fix
mysql-test/r/null_key.result:
  post-merge fix
mysql-test/r/rpl000002.result:
  post-merge fix
mysql-test/r/rpl000015.result:
  post-merge fix
mysql-test/r/rpl000016.result:
  post-merge fix
mysql-test/r/rpl_log.result:
  post-merge fix
mysql-test/r/show_check.result:
  post-merge fix
mysql-test/t/rpl000002.test:
  post-merge fix
mysql-test/t/rpl000015.test:
  post-merge fix
mysql-test/t/rpl000016.test:
  post-merge fix
2001-10-03 15:19:58 -06:00
unknown
7968bc7f66 merged
client/Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2001-10-03 14:21:16 -06:00
unknown
5a18acf35f fixed slave to clean up load data infile temp files
instrumented the server with DBUG_SYNC_POINT() macro


mysql-test/t/rpl_log.test:
  no change
sql/item_func.cc:
  debug_sync_point()
sql/log_event.cc:
  clead load data file tmpdir on slave on start/stop events
sql/mysql_priv.h:
  DBUG_SYNC_POINT
sql/sql_repl.cc:
  DBUG_SYNC_POINT in Create_file_event
2001-10-03 13:55:31 -06:00
unknown
83fa111679 merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  merge
  Don't give an error even if one uses master-ssl options and SSL is
  not used.
2001-10-03 18:00:38 +02:00