Commit graph

332 commits

Author SHA1 Message Date
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
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
unknown
6147228097 Merge work.mysql.com:/home/bk/mysql
into laptop.slkc.uswest.net:/home/sasha/src/mysql


BitKeeper/etc/logging_ok:
  auto-union
2000-11-11 15:15:27 -07:00
unknown
19d2e8ce98 laptop commit, syncing with the repostitory. Fixed some bad bugs in replication
BUILD/compile-pentium-debug:
  added -DEXTRA_DEBUG
sql/Makefile.am:
  added slave.h
sql/log_event.h:
  max_buf -> event_len in read_log_event
sql/mysql_priv.h:
  moved the slave part to slave.h
sql/mysqld.cc:
  changes for replcate_do/ignore_table ( does not work yet)
sql/slave.cc:
  removed the stuff covered by slave.h
sql/sql_class.h:
  moved slave stuff to slave.h
sql/sql_repl.h:
  removed stuff covered by slave.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-11 14:50:39 -07:00
unknown
3a3dc91907 First batch of changes in manual.texi from howard katz
Docs/manual.texi:
  First batch of changes from howard katz
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-10 12:18:03 -05:00
unknown
539d5e9492 Merge
BitKeeper/etc/logging_ok:
  Auto merged
2000-11-10 10:33:01 +01:00
unknown
62592860c1 to make bk happy
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-10 10:31:38 +01:00
unknown
1acd5898ce Added index for LOAD_FILE() to manual.
Docs/manual.texi:
  Added index for LOAD_FILE()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-08 20:15:09 -06:00
unknown
6cffc526b5 Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-06 11:13:40 -05:00
unknown
ccc273c6a6 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge
2000-11-04 20:21:22 -07:00
unknown
9184f13134 configure.in fixed to properly handle 1 digit branch
configure.in:
  fixed to properly handle 1 digit branch
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-11-05 04:19:39 +01:00
unknown
3ae05104d0 Fixed bug with ORDER BY on BDB tables.
New benchmarks tests


sql-bench/test-insert.sh:
  Added a lot of new ORDER BY tests
sql/filesort.cc:
  Fix for big BDB tables
sql/ha_berkeley.cc:
  A
sql/ha_berkeley.h:
  A
sql/handler.h:
  A
sql/sql_class.h:
  Portability fix
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-26 19:54:03 +03:00
unknown
293d7c8313 manual.texi Add new TZ-capable date type to TODO list
Docs/manual.texi:
  Add new TZ-capable date type to TODO list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-25 14:11:27 -04:00
unknown
4c2980ee85 Merge paul@work.mysql.com:/home/bk/mysql
into central.snake.net:/home/paul/mysql


BitKeeper/etc/logging_ok:
  Auto merged
2000-10-24 17:57:59 -05:00
unknown
8f7e2af1e8 Index Added latin5 (turkish) character set
manual.texi	Added latin5 (turkish) character set
configure.in	Added latin5 (turkish) character set
latin5.conf	BitKeeper file /usr/local/src/my/work/sql/share/charsets/latin5.conf


configure.in:
  Added latin5 (turkish) character set
Docs/manual.texi:
  Added latin5 (turkish) character set
sql/share/charsets/Index:
  Added latin5 (turkish) character set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-22 17:53:16 -04:00
unknown
319fe01b93 Merge paul@work.mysql.com:/home/bk/mysql
into central.snake.net:/home/paul/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-19 17:12:18 -05:00
unknown
75ea52bb43 Merge mwagner@work:/home/bk/mysql
into evoq.home.mwagner.org:/home/mwagner/work/bk/mysql


BitKeeper/etc/logging_ok:
  Auto merged
2000-10-18 08:05:47 -05:00
unknown
69c835efb7 logging_ok Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-18 08:05:22 -05:00
unknown
a1daa2fe60 Merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/manual.texi:
  merged
2000-10-17 16:42:43 +02:00
unknown
7c96a25290 RESET MASTER/SLAVE documentation
Docs/manual.texi:
  updates for RESET MASTER/SLAVE
sql/sql_insert.cc:
  bk thinks I changed something, probably inserted or deleted a space
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-16 09:32:14 -06:00
unknown
9c019f4e4f Automatic primary key for BDB tables
sql/field.h:
  Cleanup
sql/filesort.cc:
  Cleanup
sql/opt_range.cc:
  Remove index in use
sql/sql_base.cc:
  Allow Berkeley DB tables used only the index when the query only uses
  the index + data from the primary key
sql/sql_select.cc:
  Fix for left join optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-16 02:29:48 +03:00
unknown
d78f984097 Changed meaning of HA_EXTRA_RESET and start of hidden primary keys for BDB tables
heap/hp_extra.c:
  Changed meaning of HA_EXTRA_RESET
include/my_base.h:
  Added HA_EXTRA_RESET_STATE
isam/extra.c:
  Changed meaning of HA_EXTRA_RESET
isam/pack_isam.c:
  Addapt to changed HA_EXTRA_RESET
merge/extra.c:
  Changed meaning of HA_EXTRA_RESET
myisam/mi_extra.c:
  Changed meaning of HA_EXTRA_RESET
myisam/myisampack.c:
  Addapt to changed HA_EXTRA_RESET
myisammrg/myrg_extra.c:
  Addapt to changed HA_EXTRA_RESET
sql/filesort.cc:
  Addapt to changed HA_EXTRA_RESET
sql/ha_berkeley.cc:
  Hidden primary key
sql/ha_berkeley.h:
  Hidden primary key
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-15 18:45:53 +03:00
unknown
4af074054b Merge
configure.in:
  merged
BitKeeper/etc/logging_ok:
  Auto merged
sql/filesort.cc:
  merged
sql/sql_select.cc:
  merged
2000-10-07 14:05:45 +02:00
unknown
aaea3431d3 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-06 19:07:59 -06:00
unknown
dbde9337c2 Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-06 21:18:40 +03:00
unknown
6991b70c87 DISTINCT optimization
Fixes when using column privileges
Manual updates


Docs/manual.texi:
  Comments from MySQL training + distinct optimization
extra/my_print_defaults.c:
  Added --defaults-extra-file
include/my_sys.h:
  Added --defaults-extra-file
mysys/default.c:
  Added --defaults-extra-file
sql/sql_acl.cc:
  Tables with only column privileges didn't show up in SHOW GRANTS or SHOW TABLES
sql/sql_select.cc:
  DISTINCT optimization
sql/sql_select.h:
  DISTINCT optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-10-06 21:15:03 +03:00