Commit graph

1163 commits

Author SHA1 Message Date
unknown
20da4f8884 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge
2000-12-12 16:27:38 -07:00
unknown
c698629458 manual.texi minor wording change in LOAD DATA section
Docs/manual.texi:
  minor wording change in LOAD DATA section
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-12 17:27:36 -06:00
unknown
624e387916 2000-12-12 15:35:15 -07:00
unknown
56c1e86d2d Merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  SCCS merged
2000-12-08 18:39:37 +02:00
unknown
19d406d937 Lots of fixes for BDB tables
Change DROP TABLE to first drop the data, then the .frm file


Docs/manual.texi:
  Updated TODO and Changelog
include/Makefile.am:
  Portability fix
mysql-test/misc/select.res:
  ***MISSING WEAVE***
mysys/mf_iocache2.c:
  cleanup
scripts/mysqlhotcopy.sh:
  Fixed --noindices
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Updated benchmarks
sql-bench/limits/pg.cfg:
  Updated to new crash-me
sql-bench/server-cfg.sh:
  Fixes for pg 7.0.2
sql/ha_berkeley.cc:
  Lots of BDB table fixes
sql/ha_berkeley.h:
  Lots of BDB table fixes
sql/handler.cc:
  Change DROP TABLE to first drop the data, then the .frm file
sql/hostname.cc:
  Fixes for empty hostnames
sql/log.cc:
  Fixed transaction logging
sql/share/swedish/errmsg.OLD:
  cleanup
sql/sql_delete.cc:
  Fixes for logging
sql/sql_insert.cc:
  Fixes for logging
sql/sql_select.cc:
  Fixes for BDB tables
sql/sql_table.cc:
  Change DROP TABLE to first drop the data, then the .frm file
sql/sql_update.cc:
  Fixes for logging
BitKeeper/etc/ignore:
  Added scripts/mysqld_multi to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-08 17:04:57 +02:00
unknown
5d3584a306 Merge
BitKeeper/etc/gone:
  auto-merge
BitKeeper/etc/ignore:
  merged, cleaned up
2000-12-08 14:00:48 +01:00
unknown
417f8c3fde Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge
2000-12-07 21:53:35 -07:00
unknown
1324803d76 Temporary fix for handling wild_one at end of string (key compression).
Full fix shall be in MySQL 4.1. (This is a hard one (!))


sql/opt_range.cc:
  Temporary fix for handling wild_one at end of string (key compression).
  A full fix shall be somewhere in 4.1 (!) This is a hard one...
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-08 00:34:16 +02:00
unknown
47d7fe9e38 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
2000-12-07 10:23:17 -07:00
unknown
9ae7f931ce Do-all-build-steps added --without-berkeley-db
Build-tools/Do-all-build-steps:
  added --without-berkeley-db
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-07 18:22:11 +01:00
unknown
a768562aa3 Merge
BitKeeper/etc/logging_ok:
  Auto converge
configure.in:
  Auto merged
mysql-test/misc/select.res:
  ***MISSING WEAVE***
BitKeeper/etc/ignore:
  Added BitKeeper/etc/config BitKeeper/tmp/CONTENTS BitKeeper/tmp/patch BitKeeper/tmp/pid to the ignore list
mysql-test/mysql-test-run:
  merge
2000-12-07 08:10:30 -07:00
unknown
1a60318560 fixed up mysql-test - will not push this yet, as more clean up/testing is to follow
BitKeeper/deleted/.del-README~b8e00a1b57b91f69:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~2bddc2706d0834d0:
  ***MISSING WEAVE***
mysql-test/r/alt000001.result:
  mvdir
mysql-test/r/ins000001.result:
  mvdir
mysql-test/r/rpl000001.a.result:
  mvdir
mysql-test/r/rpl000001.b.result:
  mvdir
mysql-test/r/rpl000002.result:
  mvdir
mysql-test/r/rpl000003.result:
  mvdir
mysql-test/r/rpl000004.a.result:
  mvdir
mysql-test/r/rpl000004.b.result:
  mvdir
mysql-test/r/rpl000005.result:
  mvdir
mysql-test/r/rpl000006.result:
  mvdir
mysql-test/r/rpl000007.result:
  mvdir
mysql-test/r/rpl000008.result:
  mvdir
mysql-test/r/rpl000009.result:
  mvdir
mysql-test/r/rpl000010.result:
  mvdir
mysql-test/r/rpl000011.result:
  mvdir
mysql-test/r/rpl000012.result:
  mvdir
mysql-test/r/rpl000012.status.result:
  mvdir
mysql-test/r/rpl000013.result:
  mvdir
mysql-test/r/rpl000013.status.result:
  mvdir
mysql-test/r/sel000001.result:
  mvdir
mysql-test/r/sel000002.result:
  mvdir
mysql-test/r/sel000003.result:
  mvdir
mysql-test/r/sel000004.result:
  mvdir
mysql-test/r/sel000005.result:
  mvdir
mysql-test/r/sel000006.result:
  mvdir
mysql-test/r/sel000007.result:
  mvdir
mysql-test/r/sel000008.result:
  mvdir
mysql-test/r/sel000009.result:
  mvdir
mysql-test/r/sel000010.result:
  mvdir
mysql-test/r/sel000011.result:
  mvdir
mysql-test/r/sel000012.result:
  mvdir
mysql-test/r/sel000013.result:
  mvdir
mysql-test/r/sel000014.result:
  mvdir
mysql-test/r/sel000015.result:
  mvdir
mysql-test/r/sel000016.result:
  mvdir
mysql-test/r/sel000017.result:
  mvdir
mysql-test/r/sel000018.result:
  mvdir
mysql-test/r/sel000019.result:
  mvdir
mysql-test/r/sel000020.result:
  mvdir
mysql-test/r/sel000021.result:
  mvdir
mysql-test/r/sel000022.result:
  mvdir
mysql-test/r/sel000023.result:
  mvdir
mysql-test/r/sel000024.result:
  mvdir
mysql-test/r/sel000025.result:
  mvdir
mysql-test/r/sel000026.result:
  mvdir
mysql-test/r/sel000027.result:
  mvdir
mysql-test/r/sel000028.result:
  mvdir
mysql-test/r/sel000029.result:
  mvdir
mysql-test/r/sel000030.result:
  mvdir
mysql-test/r/sel000100.result:
  mvdir
mysql-test/r/shw000001.result:
  mvdir
mysql-test/t/README:
  mvdir
mysql-test/t/err000001.test:
  mvdir
mysql-test/t/rpl000007-slave.opt:
  mvdir
mysql-test/t/rpl000008-slave.opt:
  mvdir
mysql-test/t/rpl000009-slave.opt:
  mvdir
mysql-test/t/rpl000010-slave.opt:
  mvdir
mysql-test/t/rpl000013-slave.opt:
  mvdir
BitKeeper/deleted/.del-start-mysqld~9c8f21a7ab97793a:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-stop-mysqld~89a1194045f05d1c:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-translate-tests~3869c1fdf0a5ea1a:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~108667adaeabe3f5:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-README~c5aaceda4c2b1a8:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-key.master~e6b83af25df0ce5:
  ***MISSING WEAVE***
mysql-test/std_data/words.dat:
  Rename: mysql-test/std_data/words -> mysql-test/std_data/words.dat
BitKeeper/deleted/.del-simple-select.master~6f3eb98812926caf:
  ***MISSING WEAVE***
Makefile.am:
  add mysql-test to distribution
configure.in:
  added mysql-test
libmysql/Makefile.am:
  include hash.h
libmysql/Makefile.shared:
  add hash to libmysqlclient
mysql-test/Makefile.am:
  mysql-test is now in source dist also
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysql-test/install_test_db:
  renamed file, moved to different directory, and fixed up to work on binary dist
mysql-test/mysql-test-run:
  clean-up of test suite, make it work on binary dist
mysql-test/t/alt000001.test:
  moved directory
mysql-test/t/ins000001.test:
  moved directory
mysql-test/t/rpl000001.test:
  moved dir
mysql-test/t/rpl000002.test:
  moved dir
mysql-test/t/rpl000003.test:
  moved dir
mysql-test/t/rpl000004.test:
  moved dir
mysql-test/t/rpl000005.test:
  moved dir
mysql-test/t/rpl000006.test:
  moved dir
mysql-test/t/rpl000007.test:
  moved dir
mysql-test/t/rpl000008.test:
  moved dir
mysql-test/t/rpl000009.test:
  moved dir
mysql-test/t/rpl000010.test:
  moved dir
mysql-test/t/rpl000011.test:
  moved dir
mysql-test/t/rpl000012.test:
  moved dir
mysql-test/t/rpl000013.test:
  moved dir
mysql-test/t/sel000001.test:
  moved dir
mysql-test/t/sel000002.test:
  moved dir
BitKeeper/etc/ignore:
  Added libmysql_r/hash.c scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz to the ignore list
mysql-test/t/sel000003.test:
  moved dir
mysql-test/t/sel000004.test:
  moved dir
mysql-test/t/sel000005.test:
  moved dir
mysql-test/t/sel000100.test:
  moved dir
mysql-test/t/shw000001.test:
  moved dir
scripts/make_binary_distribution.sh:
  fixes to include mysql-test
  added -debug option to exit after building temp dir before tar.gz 
  removed a bunch of SCCS files
2000-12-07 07:54:59 -07:00
unknown
d81d529535 Merge
sql/sql_base.cc:
  merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-07 15:13:01 +01:00
unknown
d4fb3eecf2 Added documentation about mysql_multi_mysqld.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-07 15:27:00 +02:00
unknown
22ad54ae3f merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-07 14:38:07 +02:00
unknown
a3badce6c5 Added a new client, mysql_multi_mysqld and documentation about it.
Docs/manual.texi:
  Added documentation about new client, mysql_multi_mysqld.
  This program is meant for managing multiple MySQL servers.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-07 03:09:24 +02:00
unknown
51f6e17520 resolve merge problem
BitKeeper/etc/logging_ok:
  auto-union
2000-12-06 16:39:43 -06:00
unknown
e5c585861e Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/logging_ok:
  Auto converge
Docs/manual.texi:
  Auto merged
2000-12-06 01:55:17 +02:00
unknown
6ffa174327 Merge work:/my/mysql into donna.mysql.com:/home/my/mysql-new
Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-05 18:52:56 +02:00
unknown
1282360e16 manual.texi fixed couple of list items in description of mysql options
logging_ok	Logging to logging@openlogging.org accepted


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/manual.texi:
  fixed couple of list items in description of mysql options
2000-12-04 13:16:42 -06:00
unknown
5e8f04bb21 Merge jcole@work.mysql.com:/home/bk/mysql
into tetra.uu.net:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
2000-11-25 00:41:22 -06:00
unknown
80db9fb3c9 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge
2000-11-24 19:49:54 -07:00
unknown
d902de7da3 fixed typo in manual.texi
Docs/manual.texi:
  fixed typo
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-24 06:37:58 -06:00
unknown
46281c6799 Howard's grammar fixes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-22 10:41:40 -05:00
unknown
b500ad6427 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-11-20 12:08:53 -07:00
unknown
359ce9a1f8 gone delete files 2000-11-20 12:08:13 -07:00
unknown
0c41f69ee1 gone BitKeeper file /home/sasha/src/bk/mysql/BitKeeper/etc/gone 2000-11-20 12:06:32 -07: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
090691693b Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work


BitKeeper/etc/logging_ok:
  auto-union
2000-11-17 19:48:47 -05:00
unknown
5abcec92c0 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-18 02:15:57 +02:00
unknown
cd2f8b3f7f Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work


BitKeeper/etc/logging_ok:
  auto-union
2000-11-17 14:04:13 -05:00
unknown
104fa518b6 acinclude.m4 undef inline during some C++ tests
acinclude.m4:
  undef inline during some C++ tests
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-17 13:48:09 -05:00
unknown
650e69e21d Howard changed some formatting and grammar
Docs/manual.texi:
  Howards changed some grammar and formatting
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-17 11:58:36 -05: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
642ae16e85 New mysql client.
client/mysql.cc:
  New options --pager, --no-pager, --tee and --no-tee.
  Corresponding interactive commands are pager, nopager,
  tee and notee.
  See mysql --help, mysql> help, or the manual for more inforamation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-17 14:33:29 +02:00
unknown
645cfcb142 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 23:00:18 -07:00
unknown
3d05736057 manual.texi Added link to MySQL Free Public License in policy section.
Docs/manual.texi:
  Added link to MySQL Free Public License in policy section.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-17 06:53:08 +01: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
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
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
b3839d8dab Merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-16 13:37:03 +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
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
32335407d1 manual.texi Mirror addition.
Docs/manual.texi:
  Mirror addition.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-13 00:26:30 -06: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
23f2aaf76b logging added 2000-11-11 23:26:42 -06:00