Commit graph

216 commits

Author SHA1 Message Date
unknown
e1e6384971 Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work


BitKeeper/etc/logging_ok:
  Auto converge
2001-01-02 16:10:12 +02:00
unknown
f80143079c Check to make sure a MySQL-specific version of Berkeley DB is used.
acinclude.m4:
  check to make sure a MySQL-specific version of Berkeley DB is used.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-01-02 16:09:20 +02:00
unknown
7500f22a66 Fixes build of 3.23.30
Build-tools/Do-rpm:
  Cleanup RPM directory before new build
support-files/mysql.spec.sh:
  Removed duplicated manual entry
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-01-01 21:57:05 +01:00
unknown
7e687f893c Merge
BitKeeper/etc/ignore:
  added tmp/*
Docs/manual.texi:
  SCCS merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-01-01 14:21:12 +02:00
unknown
92e4dc353c Merge work:/home/bk/mysql
into evoq.home.mwagner.org:/opt/local/x1/work/bk/mysql


BitKeeper/deleted/.del-sql-99.eps:
  Delete: Docs/Books/sql-99.eps
BitKeeper/deleted/.del-manual.eps:
  Delete: Docs/Books/manual.eps
BitKeeper/deleted/.del-pthreads.eps:
  Delete: Docs/Books/pthreads.eps
BitKeeper/deleted/.del-algor.eps:
  Delete: Docs/Books/algor.eps
BitKeeper/deleted/.del-in_21.eps:
  Delete: Docs/Books/in_21.eps
BitKeeper/deleted/.del-dubois.eps:
  Delete: Docs/Books/dubois.eps
BitKeeper/deleted/.del-ecomm.eps:
  Delete: Docs/Books/ecomm.eps
BitKeeper/deleted/.del-dbi.eps:
  Delete: Docs/Books/dbi.eps
BitKeeper/deleted/.del-prof.eps:
  Delete: Docs/Books/prof.eps
BitKeeper/deleted/.del-realmen.eps:
  Delete: Docs/Books/realmen.eps
BitKeeper/deleted/.del-msql.eps:
  Delete: Docs/Books/msql.eps
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-31 17:51:25 -06:00
unknown
4a4fe6f2fc sql-99.eps BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/sql-99.eps
algor.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/algor.eps
dbi.eps 	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/dbi.eps
dubois.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/dubois.eps
ecomm.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/ecomm.eps
in_21.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/in_21.eps
manual.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/manual.eps
msql.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/msql.eps
prof.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/prof.eps
pthreads.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/pthreads.eps
realmen.eps	BitKeeper file /d1/users/mwagner/work/bk/mysql/Docs/Books/realmen.eps


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-31 21:45:12 +01:00
unknown
7b29098d6b Merge work:/home/bk/mysql
into evoq.home.mwagner.org:/home/mwagner/work/bk/mysql


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
2000-12-16 12:30:54 -06:00
unknown
2488141658 BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2000-12-16 12:28:19 -06:00
unknown
e6649520ab 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-16 01:19:53 +02:00
unknown
a2f441baaf Updated references to 3.23 as "beta" to "Gamma" in the manual.
Docs/manual.texi:
  Updated references to 3.23 as "beta" to "Gamma"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-15 10:20:25 -06:00
unknown
68d0f88c5e merge
BitKeeper/etc/logging_ok:
  auto-union
2000-12-15 16:18:00 +02:00
unknown
e9f0fabfc9 Add SHOW LOGS command.
sql/ha_berkeley.cc:
  - add berkeley_show_logs()
sql/ha_berkeley.h:
  - add berkeley_show_logs()
sql/mysql_priv.h:
  - add show_logs()
sql/sql_lex.h:
  - add show_logs()
sql/sql_parse.cc:
  - add show_logs()
sql/sql_show.cc:
  - add show_logs()
sql/sql_yacc.yy:
  - add show_logs()
Docs/manual.texi:
  - add show_logs()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-15 13:18:52 +02:00
unknown
e7fde22e1a Merge narttu:/my/mysql into tik.mysql.com:/home/my/mysql
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
2000-12-15 11:09:15 +02:00
unknown
e1e7ba756a Fixed that LPAD() and RPAD() cuts arguments
New test for string functions


Docs/manual.texi:
  Updated changes for 3.23.29
client/mysqldump.c:
  Cleanup
libmysql/libmysql.c:
  Fixed possible overflow
sql/handler.cc:
  Fixed typo
sql/item_strfunc.cc:
  Fixed that LPAD() and RPAD() cuts arguments
sql/mysqld.cc:
  Better error message on core dump
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-15 10:58:17 +02:00
unknown
2d47dfa0ce Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge
2000-12-13 09:59:36 -07:00
unknown
e9797c89e4 mysql.spec.sh Don't install BDB
Do-patch-file	Update for new web structure
Makefile.am	Added dependency for manual_toc.html
Makefile.am	Replaced chmod with RM to avoid error message


include/Makefile.am:
  Replaced chmod with RM to avoid error message
Docs/Makefile.am:
  Added dependency for manual_toc.html
Build-tools/Do-patch-file:
  Update for new web structure
support-files/mysql.spec.sh:
  Don't install BDB
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-12-13 12:43:45 +01:00
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
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
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
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
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