Commit graph

3938 commits

Author SHA1 Message Date
unknown
b5cfb7ac01 merge with 3.23.47
Docs/manual.texi:
  Auto merged
Build-tools/Do-compile:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/handler.h:
  Auto merged
configure.in:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join_outer.result:
  merge
mysql-test/r/myisam.result:
  merge
mysql-test/t/innodb.test:
  merge
mysys/mf_iocache2.c:
  Skip changes in 3.23
sql/sql_select.cc:
  merge
2001-12-06 01:16:28 +02:00
monty@hundin.mysql.fi
5c94a16422 merge with 3.23.47 2001-12-06 01:16:28 +02:00
unknown
6f8f45e959 Small changes to mysql_config.sh
Docs/manual.texi:
  Changelog
scripts/mysql_config.sh:
  Fix script to search in different directories for include and lib
2001-12-05 23:56:56 +02:00
monty@hundin.mysql.fi
0f71e337b3 Small changes to mysql_config.sh 2001-12-05 23:56:56 +02:00
unknown
2a74eb824f Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-12-05 23:26:14 +02:00
monty@hundin.mysql.fi
81ea1a6e1a Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-12-05 23:26:14 +02:00
unknown
e8d81970be Fixed bug in LEFT JOIN
Docs/manual.texi:
  ChangeLog
myisam/mi_locking.c:
  Remove wrong optimistic locking. (Doesn't affect MySQL)
mysys/my_init.c:
  Release character sets at end
scripts/mysqlhotcopy.sh:
  RAID tables are now copied
2001-12-05 23:15:05 +02:00
monty@hundin.mysql.fi
90004e340b Fixed bug in LEFT JOIN 2001-12-05 23:15:05 +02:00
unknown
89b0b23464 get correct paths in mysql_config even if the user moves basedir
scripts/mysql_config.sh:
  get correct paths even if the user moves basedir
2001-12-01 19:37:30 -07:00
sasha@mysql.sashanet.com
2f91f2360a get correct paths in mysql_config even if the user moves basedir 2001-12-01 19:37:30 -07:00
unknown
b631ea0188 merge
Docs/manual.texi:
  Auto merged
mysql-test/t/rpl000013.test:
  Auto merged
mysql-test/t/rpl000016.test:
  Auto merged
extra/resolveip.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-11-28 14:52:11 +02:00
monty@hundin.mysql.fi
69f6802632 merge 2001-11-28 14:52:11 +02:00
unknown
aaed141aa6 Small safety fix
Docs/manual.texi:
  Cleanup
extra/resolveip.c:
  Portability fix
man/safe_mysqld.1:
  Cleanup
mysys/mf_iocache2.c:
  Safety fix
scripts/make_binary_distribution.sh:
  Add mysqlbinlog
2001-11-28 02:24:22 +02:00
monty@hundin.mysql.fi
e4bdf26066 Small safety fix 2001-11-28 02:24:22 +02:00
unknown
d207a0c2f0 merge
innobase/include/srv0srv.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
2001-11-07 00:19:36 +02:00
monty@hundin.mysql.fi
f9a321af8a merge 2001-11-07 00:19:36 +02:00
unknown
f271c8145d Added missing mysqlbinlog to binary distributions.
Applied patch to mysqlhotcopy


myisam/mi_open.c:
  Fixed some purify warnings
mysql-test/mysql-test-run.sh:
  Added --core as default to test suite
scripts/make_binary_distribution.sh:
  Added missing mysqlbinlog
scripts/mysqlhotcopy.sh:
  Applied patch with --record-log option
sql/item_timefunc.cc:
  Fixed problem with SEC_TO_TIME() for long signed integers.
2001-11-07 00:08:57 +02:00
monty@hundin.mysql.fi
4157d12df5 Added missing mysqlbinlog to binary distributions.
Applied patch to mysqlhotcopy
2001-11-07 00:08:57 +02:00
unknown
47d42a13f6 Fix the NOHUP_NICENESS test in mysqld_safe.
scripts/mysqld_safe.sh:
  Fix the NOHUP_NICENESS test; previously it would break if the
  process already had a negative priority.
2001-10-22 11:22:55 -04:00
tim@black.box
d83b557f4a Fix the NOHUP_NICENESS test in mysqld_safe. 2001-10-22 11:22:55 -04:00
unknown
2a4845b484 Cleanups
client/mysqlmanagerc.c:
  Only use needed include files
libmysql/manager.c:
  cleanup include files
scripts/make_binary_distribution.sh:
  Fixed wrong filename
sql/mysqld.cc:
  cleanup
tools/mysqlmanager.c:
  Read with retrys
2001-10-11 22:02:16 +03:00
monty@hundin.mysql.fi
6afbeb4cf4 Cleanups 2001-10-11 22:02:16 +03:00
unknown
b8eb83d42c Portability fixes
Fixed bug with long log-filenames in Innobase.


mysql-test/r/select.result:
  Turn off SCCS flag
mysql-test/t/alias.test:
  Turn off SCCS flag
mysql-test/t/backup.test:
  Turn off SCCS flag
mysql-test/t/bdb-crash.test:
  Turn off SCCS flag
mysql-test/t/bench_count_distinct.test:
  Turn off SCCS flag
mysql-test/t/bulk_replace.test:
  Turn off SCCS flag
mysql-test/t/check.test:
  Turn off SCCS flag
mysql-test/t/count_distinct2-master.opt:
  Turn off SCCS flag
mysql-test/t/count_distinct2.test:
  Turn off SCCS flag
mysql-test/t/dirty-close.test:
  Turn off SCCS flag
mysql-test/t/drop.test:
  Turn off SCCS flag
mysql-test/t/flush.test:
  Turn off SCCS flag
mysql-test/t/fulltext_cache.test:
  Turn off SCCS flag
mysql-test/t/fulltext_distinct.test:
  Turn off SCCS flag
mysql-test/t/fulltext_left_join.test:
  Turn off SCCS flag
mysql-test/t/fulltext_update.test:
  Turn off SCCS flag
mysql-test/t/fulltext_var.test:
  Turn off SCCS flag
mysql-test/t/handler.test:
  Turn off SCCS flag
mysql-test/t/having.test:
  Turn off SCCS flag
mysql-test/t/innodb.test:
  Turn off SCCS flag
mysql-test/t/join_crash.test:
  Turn off SCCS flag
mysql-test/t/kill.test:
  Turn off SCCS flag
mysql-test/t/lock.test:
  Turn off SCCS flag
mysql-test/t/multi_update.test:
  Turn off SCCS flag
mysql-test/t/myisam.test:
  Turn off SCCS flag
mysql-test/t/openssl_1.test:
  Turn off SCCS flag
mysql-test/t/openssl_2.test:
  Turn off SCCS flag
mysql-test/t/order_fill_sortbuf-master.opt:
  Turn off SCCS flag
mysql-test/t/order_fill_sortbuf.test:
  Turn off SCCS flag
mysql-test/t/overflow.test:
  Turn off SCCS flag
mysql-test/t/rpl000007-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000008-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000009-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000010-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000013-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000015-slave-master-info.opt:
  Turn off SCCS flag
mysql-test/t/rpl000015-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000016-master.opt:
  Turn off SCCS flag
mysql-test/t/rpl000016-slave-master-info.opt:
  Turn off SCCS flag
mysql-test/t/rpl000016-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000017-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000017-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000017.test:
  Turn off SCCS flag
mysql-test/t/rpl000018-master.opt:
  Turn off SCCS flag
mysql-test/t/rpl000018-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000018.test:
  Turn off SCCS flag
mysql-test/t/rpl_log.test:
  Turn off SCCS flag
mysql-test/t/rpl_magic.test:
  Turn off SCCS flag
mysql-test/t/rpl_mystery22.test:
  Turn off SCCS flag
mysql-test/t/rpl_sporadic_master-master.opt:
  Turn off SCCS flag
mysql-test/r/alias.result:
  Turn off SCCS flag
mysql-test/r/backup.result:
  Turn off SCCS flag
mysql-test/r/bdb-crash.result:
  Turn off SCCS flag
mysql-test/r/bench_count_distinct.result:
  Turn off SCCS flag
mysql-test/r/big_test.require:
  Turn off SCCS flag
mysql-test/r/bulk_replace.result:
  Turn off SCCS flag
mysql-test/r/check.result:
  Turn off SCCS flag
mysql-test/r/count_distinct2.result:
  Turn off SCCS flag
mysql-test/r/dirty-close.result:
  Turn off SCCS flag
mysql-test/r/drop.result:
  Turn off SCCS flag
mysql-test/r/flush.result:
  Turn off SCCS flag
mysql-test/r/fulltext_cache.result:
  Turn off SCCS flag
mysql-test/r/fulltext_distinct.result:
  Turn off SCCS flag
mysql-test/r/fulltext_left_join.result:
  Turn off SCCS flag
mysql-test/r/fulltext_multi.result:
  Turn off SCCS flag
mysql-test/r/fulltext_order_by.result:
  Turn off SCCS flag
mysql-test/r/fulltext_update.result:
  Turn off SCCS flag
mysql-test/r/fulltext_var.result:
  Turn off SCCS flag
mysql-test/r/func_timestamp.result:
  Turn off SCCS flag
mysql-test/t/rpl_sporadic_master.test:
  Turn off SCCS flag
mysql-test/t/select_found.test:
  Turn off SCCS flag
mysql-test/t/status.test:
  Turn off SCCS flag
mysql-test/t/symlink.test:
  Turn off SCCS flag
mysql-test/t/type_decimal.test:
  Turn off SCCS flag
mysql-test/t/union.test:
  Turn off SCCS flag
mysql-test/t/user_var.test:
  Turn off SCCS flag
mysql-test/r/handler.result:
  Turn off SCCS flag
mysql-test/r/have_bdb.require:
  Turn off SCCS flag
mysql-test/r/have_innodb.require:
  Turn off SCCS flag
mysql-test/r/have_isam.require:
  Turn off SCCS flag
mysql-test/r/have_openssl.require:
  Turn off SCCS flag
mysql-test/r/have_openssl_1.require:
  Turn off SCCS flag
mysql-test/r/have_openssl_2.require:
  Turn off SCCS flag
mysql-test/r/have_raid.require:
  Turn off SCCS flag
mysql-test/r/have_symlink.require:
  Turn off SCCS flag
mysql-test/r/having.result:
  Turn off SCCS flag
mysql-test/r/innodb.result:
  Turn off SCCS flag
mysql-test/r/join_crash.result:
  Turn off SCCS flag
mysql-test/r/kill.result:
  Turn off SCCS flag
mysql-test/r/lock.result:
  Turn off SCCS flag
mysql-test/r/multi_update.result:
  Turn off SCCS flag
mysql-test/r/myisam.result:
  Turn off SCCS flag
mysql-test/r/openssl_1.result:
  Turn off SCCS flag
mysql-test/r/openssl_2.result:
  Turn off SCCS flag
mysql-test/r/order_fill_sortbuf.result:
  Turn off SCCS flag
mysql-test/r/rpl000001.result:
  Turn off SCCS flag
mysql-test/r/rpl000004.result:
  Turn off SCCS flag
mysql-test/r/rpl000017.result:
  Turn off SCCS flag
mysql-test/r/rpl000018.result:
  Turn off SCCS flag
mysql-test/r/rpl_log.result:
  Turn off SCCS flag
mysql-test/r/rpl_magic.result:
  Turn off SCCS flag
mysql-test/r/rpl_mystery22.result:
  Turn off SCCS flag
mysql-test/r/rpl_sporadic_master.result:
  Turn off SCCS flag
mysql-test/r/select_found.result:
  Turn off SCCS flag
mysql-test/r/status.result:
  Turn off SCCS flag
mysql-test/r/symlink.result:
  Turn off SCCS flag
mysql-test/r/type_decimal.result:
  Turn off SCCS flag
mysql-test/r/union.result:
  Turn off SCCS flag
mysql-test/r/user_var.result:
  Turn off SCCS flag
Docs/manual.texi:
  Fixed typo.
innobase/log/log0log.c:
  Fixed too short filename buffer.
mysys/mf_sort.c:
  Ensure that radix isn't used for VERY big arrrays.
scripts/make_binary_distribution.sh:
  Add mysqlmanager-pwgen and mysqlmanagerc into binary distribution.
sql-bench/test-insert.sh:
  Time out update_with_key_prefix
sql/ha_innobase.cc:
  Use current directory as base dir, if we are not using the embedded version.
tools/mysqlmanager.c:
  Portability fix
2001-10-11 04:25:00 +03:00
monty@hundin.mysql.fi
075a0fbde0 Portability fixes
Fixed bug with long log-filenames in Innobase.
2001-10-11 04:25:00 +03:00
unknown
229e25f8cf Always build thread safe client libraries in the distributed build
Add mysqlmanager to binary distribution.


Build-tools/Do-compile:
  Always build thread safe client libraries.
Docs/manual.texi:
  More info about SET
client/mysqldump.c:
  Cleanup
scripts/make_binary_distribution.sh:
  Add mysqlmanager
support-files/mysql.spec.sh:
  Added mysqlmanager to RPM
2001-10-10 23:44:07 +03:00
monty@hundin.mysql.fi
6265dfccda Always build thread safe client libraries in the distributed build
Add mysqlmanager to binary distribution.
2001-10-10 23:44:07 +03: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
monty@hundin.mysql.fi
06e719b7cc Remved Gemini code. 2001-10-10 02:50:28 +03:00
unknown
9417dc5c17 Portability fixes + a couple of bug fixes introduced by last push.
Docs/manual.texi:
  Removed wrong web links
include/mysql_com.h:
  Portability fix
libmysqld/Makefile.am:
  Fix 'make dist'
mysys/mf_dirname.c:
  Bugfix for last push
scripts/explain_log.sh:
  Nicer output
scripts/mysql_install_db.sh:
  Removed warnings when using 'mysql_install_db'
sql/sql_parse.cc:
  Ensure that thd->query_length is always set
sql/sql_show.cc:
  cleanup
sql/sql_yacc.yy:
  Fix bug in last push
vio/vio.c:
  Merge with violite.cc
vio/viosocket.c:
  Merge with violite.cc
2001-10-08 23:20:19 +03:00
monty@hundin.mysql.fi
196f620e90 Portability fixes + a couple of bug fixes introduced by last push. 2001-10-08 23:20:19 +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
monty@hundin.mysql.fi
88aff4bf85 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
2001-10-08 04:58:07 +03: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
monty@hundin.mysql.fi
e801235019 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
2001-10-04 21:52:41 +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
monty@hundin.mysql.fi
62c8014171 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
2001-10-04 02:44:18 +03:00
unknown
9e72e1ef53 Cleaned up SSL documentation
Fixes for embedded server
Made key_cache more configurable
Fixed that one can change key blocksize in MyISAM
A lot of optimizations to make MyISAM slightly faster


Docs/manual.texi:
  Cleaned up SSL documentation
client/mysql.cc:
  Fixes for embedded server
client/mysqltest.c:
  Fixes for embedded server
  Removed memory and file leaks
include/my_global.h:
  Added C_MODE_START / C_MODE_END macros
include/my_sys.h:
  Made key_cache more configurable
include/myisam.h:
  Fixed that one can change MyISAM key block size
include/mysql.h:
  Fixes for embedded server
libmysql/libmysql.c:
  Cleanup
libmysqld/Makefile.am:
  Cleanup
libmysqld/examples/test-run:
  Added --debug
libmysqld/lib_sql.cc:
  Cleanup
libmysqld/libmysqld.c:
  Cleanup
myisam/ft_boolean_search.c:
  Optimized mi_key_cmp to be faster
myisam/ft_nlq_search.c:
  Optimized mi_key_cmp to be faster
myisam/ft_search.c:
  Optimized mi_key_cmp to be faster
myisam/mi_changed.c:
  Optimized mi_key_cmp to be faster
myisam/mi_check.c:
  Optimized mi_key_cmp to be faster
myisam/mi_create.c:
  Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_delete.c:
  Optimized mi_key_cmp to be faster
myisam/mi_delete_all.c:
  Optimized mi_key_cmp to be faster
myisam/mi_dynrec.c:
  Speed optimizations
myisam/mi_info.c:
  Speed optimizations
myisam/mi_key.c:
  Speed optimizations
myisam/mi_locking.c:
  Speed optimizations
myisam/mi_open.c:
  Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_page.c:
  Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_range.c:
  Speed optimizations
myisam/mi_rkey.c:
  Speed optimizations
myisam/mi_rnext.c:
  Speed optimizations
myisam/mi_rnext_same.c:
  Speed optimizations
myisam/mi_rprev.c:
  Speed optimizations
myisam/mi_rsame.c:
  Speed optimizations
myisam/mi_search.c:
  Speed optimizations
myisam/mi_static.c:
  Fixed that one can change blocksize by changing myisam_block_size
myisam/mi_statrec.c:
  Speed optimizations
myisam/mi_test2.c:
  Added more test options
myisam/mi_test_all.res:
  Added more test options
myisam/mi_test_all.sh:
  Added more test options
myisam/mi_write.c:
  Speed optimizations
myisam/myisamchk.c:
  Added options to change block size and repair checksums
myisam/myisamdef.h:
  Speed optimizations
mysys/Makefile.am:
  Added bit handling functions
mysys/mf_keycache.c:
  Made key_cache more configurable
mysys/my_init.c:
  made my_init_done global
scripts/mysql_fix_privilege_tables.sh:
  Fixes for SSL
scripts/mysql_install_db.sh:
  Fixes for SSL
sql/derror.cc:
  Don't call exit, call unireg_abort()
sql/item_cmpfunc.cc:
  Speed optimizations
sql/item_cmpfunc.h:
  Speed optimizations
sql/mysql_priv.h:
  Fixes for embedded server
sql/mysqld.cc:
  Fixes for embedded server
2001-10-02 05:53:00 +03:00
monty@hundin.mysql.fi
880026ccf6 Cleaned up SSL documentation
Fixes for embedded server
Made key_cache more configurable
Fixed that one can change key blocksize in MyISAM
A lot of optimizations to make MyISAM slightly faster
2001-10-02 05:53:00 +03:00
unknown
6e8704ee09 Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0


acinclude.m4:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/structs.h:
  Auto merged
Docs/manual.texi:
  Auto merged
2001-09-30 10:47:32 +08:00
tonu@volk.internalnet
a16796c8ac Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
2001-09-30 10:47:32 +08:00
unknown
d13f2dfdeb SSL compiles and works as far as can see. Continue testing..
Docs/manual.ja.texi:
  e-mail address fixed
include/mysqld_error.h:
  Added 3 new errormessages related to SSL
mysql-test/install_test_db.sh:
  SSL fix
scripts/mysql_install_db.sh:
  mysql.user table changes to conform SSL ACL
sql/lex.h:
  Fixed GRANT+SSL clause
sql/share/czech/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/danish/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/dutch/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/english/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/estonian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/french/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/german/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/greek/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/hungarian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/italian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/japanese/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/korean/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/norwegian-ny/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/norwegian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/polish/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/portuguese/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/romanian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/russian/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/slovak/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/spanish/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/swedish/errmsg.txt:
  Added 3 new errormessages related to SSL
sql/share/ukrainian/errmsg.txt:
  Added 3 new errormessages related to SSL
Docs/manual.texi:
  SSL fixes
BUILD/compile-pentium-max:
  SSL was missing here
acinclude.m4:
  typo fix
  alignment fix
client/mysql.cc:
  SSL fixes
client/mysqladmin.c:
  SSL fixes
client/mysqlcheck.c:
  SSL fixes
client/mysqldump.c:
  SSL fixes
client/mysqlimport.c:
  SSL fixes
client/mysqlshow.c:
  SSL fixes
include/mysql.h:
  SSL fixes
include/sslopt-case.h:
  SSL fixes
include/sslopt-longopts.h:
  SSL fixes
include/sslopt-usage.h:
  SSL fixes
include/sslopt-vars.h:
  SSL fixes
include/violite.h:
  SSL fixes
  cleanups
libmysql/libmysql.c:
  SSL fixes
libmysqld/lib_sql.cc:
  SSL fixes
sql/mini_client.cc:
  SSL fixes
sql/mysqld.cc:
  SSL fixes
  cleanup
  new variables to SHOW STATUS
sql/sql_acl.cc:
  SSL fixes
sql/sql_acl.h:
  SSL fixes
sql/sql_lex.h:
  SSL fixes
sql/sql_parse.cc:
  SSL fixes
sql/sql_show.cc:
  New functions added
sql/structs.h:
  New functions added
vio/test-ssl.c:
  SSL fixes
vio/test-sslclient.c:
  SSL fixes
vio/test-sslserver.c:
  SSL fixes
vio/viosocket.c:
  SSL fixes
vio/viossl.c:
  SSL fixes
  cleanup
vio/viosslfactories.c:
  SSL fixes
sql/sql_yacc.yy:
  SSL fixes
2001-09-30 10:46:20 +08:00
tonu@volk.internalnet
5658ff8237 SSL compiles and works as far as can see. Continue testing.. 2001-09-30 10:46:20 +08:00
unknown
1a57e278c2 merge
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.cc:
  Auto merged
2001-09-28 06:28:04 +02:00
monty@work.mysql.com
390e57687b merge 2001-09-28 06:28:04 +02:00
unknown
b39ab7090a Cleaned up udf_example.cc and mysql_fix_privilege_tables
acinclude.m4:
  Fixed typo in configure
scripts/mysql_fix_privilege_tables.sh:
  Use CREATE TABLE IF EXISTS to avoid warnings
sql/udf_example.cc:
  Fixed that avgcost() is compiled properly.
  Added more comments
2001-09-27 21:35:35 +03:00
monty@tik.mysql.fi
99b58a5aa9 Cleaned up udf_example.cc and mysql_fix_privilege_tables 2001-09-27 21:35:35 +03:00
unknown
d8ae9669cd merge
Docs/manual.texi:
  Auto merged
extra/perror.c:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql.h:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
2001-09-17 23:26:00 +02:00
monty@work.mysql.com
eb9cbe2cba merge 2001-09-17 23:26:00 +02:00
unknown
ffe994614f Added unique error for DEADLOCK
Include missing man pages into binary distribution


BitKeeper/deleted/.del-make_mysql_pkg.sh~c616a18bed4b9c2:
  Delete: support-files/make_mysql_pkg.sh
Docs/manual.texi:
  Changelog
extra/perror.c:
  Added missing error codes
include/my_base.h:
  Added unique error for DEADLOCK
include/mysql.h:
  Portability fix for the LCC windows compiler
include/mysqld_error.h:
  Added unique error for DEADLOCK
scripts/make_binary_distribution.sh:
  Include missing man pages into binary distribution
sql/ha_berkeley.cc:
  Added unique error for DEADLOCK
sql/ha_berkeley.h:
  Added unique error for DEADLOCK
sql/handler.h:
  Added unique error for DEADLOCK
sql/mysqld.cc:
  Portability fix
sql/share/czech/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/danish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/dutch/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/english/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/estonian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/french/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/german/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/greek/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/hungarian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/italian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/japanese/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/korean/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/norwegian-ny/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/norwegian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/polish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/portuguese/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/romanian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/russian/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/slovak/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/spanish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/swedish/errmsg.txt:
  Added unique error for DEADLOCK
sql/share/ukrainian/errmsg.txt:
  Added unique error for DEADLOCK
2001-09-17 23:43:53 +03:00
monty@hundin.mysql.fi
56cc14ab4c Added unique error for DEADLOCK
Include missing man pages into binary distribution
2001-09-17 23:43:53 +03:00