1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Commit Graph

6099 Commits

Author SHA1 Message Date
e7f6ed657d Merge
Docs/manual.texi:
  merged
2000-08-24 21:53:42 +04:00
cb487587b0 manual.texi full-text manual added
Docs/manual.texi:
  full-text manual added
2000-08-24 21:51:31 +04:00
84c4f972b8 Corrections to 'LOAD DATA INFILE' options
Docs/manual.texi:
  Fixed syntax on 'LOAD DATA INFILE'
2000-08-24 12:35:01 -05:00
b7af9506f2 Merge tim@work:/home/bk/mysql
into localhost.polyesthetic.msg:/usr/local/src/my/work
2000-08-23 15:47:28 -04:00
5e99be1dcd The previous commit to this file introduced several syntax (etc.)
errors related to changing the TYPELIB to CS_ID.


BitKeeper/deleted/.del-config.h.in:
  ***MISSING WEAVE***
mysys/charset.c:
  - fix numerous syntax errors from previous commit
2000-08-23 15:46:40 -04:00
b1cc91fae6 Replication fixes
sql/log_event.cc:
  changed uint to uint32 in all places where the code depended on 
  sizeof(uint) to be 4
sql/log_event.h:
  changed uint to uint32 in all places where the code depended on 
  sizeof(uint) to be 4
sql/slave.cc:
  Monty's I64 fix broke my fprintf(), to fix it, changed to use llstr() 
  to print mi->pos that has become ulonglong
2000-08-23 13:27:33 -06:00
448fa9f1cd Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


Docs/manual.texi:
  Auto merged
2000-08-23 10:46:38 -06:00
5b285c979f Documented the new replication features
Docs/manual.texi:
  Documented the new replication features in 3.23.23
2000-08-23 10:45:56 -06:00
cd694f987c Index removed out-of-date win1251 character set
sql/share/charsets/Index:
  removed out-of-date win1251 character set
2000-08-23 11:05:41 -04:00
800a71ff3c Merge tim@work:/home/bk/mysql
into localhost.polyesthetic.msg:/usr/local/src/my/work
2000-08-23 11:03:13 -04:00
2a77d18c76 latin1.conf - fixed several sort order problems
german1.conf	- fixed several sort order problems


sql/share/charsets/german1.conf:
  - fixed several sort order problems
sql/share/charsets/latin1.conf:
  - fixed several sort order problems
2000-08-23 10:50:11 -04:00
7f32301f67 Merge jcole@jcole:/home/jcole/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged
2000-08-23 07:09:16 -05:00
451ef26a31 Updated mysqlhotcopy to use the new ``FLUSH TABLES table_list'' syntax.
Docs/manual.texi:
  ChangeLog entry for mysqlhotcopy update.
scripts/mysqlhotcopy.sh:
  Updated to use the new ``FLUSH TABLES table_list'' syntax.
2000-08-23 07:07:24 -05:00
844c92364e Fixes for Ia64
Docs/manual.texi:
  Updated thread safe client chapter + new links
client/sql_string.cc:
  Update for Ia64
client/sql_string.h:
  Update for Ia64
extra/replace.c:
  Update for Ia64
include/config-win.h:
  Update for PHP
include/global.h:
  Update for PHP
isam/create.c:
  Update for Ia64
isam/delete.c:
  Update for Ia64
isam/write.c:
  Update for Ia64
libmysql/Makefile.shared:
  new file
libmysql/libmysql.c:
  Update for Ia64
libmysql/net.c:
  Update for Ia64
myisam/mi_delete.c:
  Update for Ia64
myisam/mi_search.c:
  Update for Ia64
sql/field.cc:
  Update for Ia64
sql/field.h:
  Update for Ia64
sql/item.h:
  Update for Ia64
sql/item_strfunc.cc:
  Update for Ia64
sql/lock.cc:
  Update for Ia64
sql/log.cc:
  Update for Ia64
sql/log_event.h:
  Update for Ia64
sql/net_serv.cc:
  Update for Ia64
sql/sql_list.h:
  Update for Ia64
sql/sql_parse.cc:
  Update for Ia64
sql/sql_rename.cc:
  Update for Ia64
sql/sql_select.cc:
  Update for Ia64
sql/sql_show.cc:
  Update for Ia64
sql/sql_string.cc:
  Update for Ia64
sql/sql_string.h:
  Update for Ia64
sql/time.cc:
  Update for Ia64
2000-08-23 15:02:27 +03:00
06c5858538 Merge tim@work:/home/bk/mysql
into localhost.polyesthetic.msg:/usr/local/src/my/work


configure.in:
  Auto merged
2000-08-22 16:09:27 -04:00
db3b3c1799 Associate a charset directly with its number in the Index file, and
propogate those changes through the code.  This is so that there can
be holes in the list of charsets without breaking old tables.


configure.in:
  - changed pattern for getting number from charsets Index file
mysys/charset.c:
  - changed from using a TYPELIB to a CS_ID struct, so both the name
    and the number of a charset is stored in available_charsets
sql/share/charsets/Index:
  - made the number a real part of the Index file, not just a comment
sql/share/charsets/README:
  - order is no longer significant, but each charset must be paired
    with its number
2000-08-22 16:08:34 -04:00
11f402b310 Spelling mistake in sql/Makefile.am
sql/Makefile.am:
  Spelling mistake.
2000-08-22 04:36:43 -05:00
69bb38752c Merge
configure.in:
  Merged
Docs/manual.texi:
  Merged
2000-08-22 12:33:46 +04:00
35adc31916 Fix to previous commit (otherwise bk fails at check stage :-( )
sql/share/estonian/errmsg.sys:
  Rename: sql/share/estonia/errmsg.sys -> sql/share/estonian/errmsg.sys
sql/share/romanian/errmsg.sys:
  Rename: sql/share/romania/errmsg.sys -> sql/share/romanian/errmsg.sys
2000-08-22 12:31:45 +04:00
792ee2ae46 Languages list corrected (romania->romanian, estonia->estonian)
BitKeeper/deleted/.del-errmsg.sys:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-errmsg.txt:
  ***MISSING WEAVE***
sql/share/estonian/errmsg.txt:
  Rename: sql/share/estonia/errmsg.txt -> sql/share/estonian/errmsg.txt
sql/share/romanian/errmsg.txt:
  Rename: sql/share/romania/errmsg.txt -> sql/share/romanian/errmsg.txt
Docs/manual.texi:
  Language list corrected
configure.in:
  Language list corrected (AVAILABLE_LANGUAGES)
2000-08-22 12:16:58 +04:00
49f3142f3a Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-08-21 17:36:17 -06:00
afbecb2979 Merge monty@work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql 2000-08-22 01:36:12 +03:00
4d7c91d8b2 Fix typo 2000-08-22 01:35:50 +03:00
e82e27c6c8 Spelling correction for release. 2000-08-21 17:26:39 -05:00
e9a277164b merge 2000-08-22 00:57:50 +03:00
9d7c3ceed2 Fix for snprintf 2000-08-22 00:55:45 +03:00
49b83f3810 Merge tim@work:/home/bk/mysql
into localhost.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged
2000-08-21 17:45:11 -04:00
6a03dbc439 Updated the description on version 3.23, and added
--enable-thread-safe-client item to Change log.


Docs/manual.texi:
  - updated the description on version 3.23
  - added --enable-thread-safe-client item to Change log
2000-08-21 17:44:16 -04:00
a803c36b70 Removed end space
BUILD/compile-pentium:
  Added build of multi-threaded library
2000-08-22 00:39:08 +03:00
e31760c015 merge
Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Merge
sql/sql_yacc.yy:
  Merge
2000-08-22 00:37:04 +03:00
90104181f9 FLUSH TABLE table_list
Fixes for RENAME TABLE
Portability fixes


Docs/manual.texi:
  FLUSH TABLES table_list
client/mysql.cc:
  Ia64 port
client/mysqladmin.c:
  Ia64 port
client/mysqldump.c:
  Ia64 port
client/mysqlimport.c:
  Ia64 port
client/mysqlshow.c:
  Ia64 port
client/readline.cc:
  Ia64 port
configure.in:
  Ia64 port
include/config-win.h:
  Ia64 port
include/thr_alarm.h:
  Ia64 port
myisam/myisamdef.h:
  Ia64 port
myisammrg/myrg_rkey.c:
  Ia64 port
mysys/thr_alarm.c:
  Easier compile of non threaded client
mysys/thr_lock.c:
  Easier compile of non threaded client
mysys/thr_mutex.c:
  Easier compile of non threaded client
sql-bench/crash-me.sh:
  Added test for RENAME + some ANSI SQL99 group functions
sql-bench/limits/mysql.cfg:
  New run
sql-bench/server-cfg.sh:
  Fix
sql-bench/test-insert.sh:
  Fix
sql/field.cc:
  Port to Ia64
sql/ha_berkeley.cc:
  Port to Ia64
sql/ha_myisam.cc:
  cleanup
sql/handler.cc:
  Port to Ia64
sql/hostname.cc:
  Port to Ia64
sql/item.cc:
  Port to Ia64
sql/item_create.cc:
  Port to Ia64
sql/item_func.cc:
  Port to Ia64
sql/item_strfunc.cc:
  Port to Ia64
sql/item_timefunc.cc:
  Port to Ia64
sql/lock.cc:
  Fix for RENAME
sql/log.cc:
  Port to Ia64
sql/log_event.h:
  Port to Ia64
sql/mini_client.cc:
  Port to Ia64
sql/mysql_priv.h:
  Port to Ia64
sql/mysqlbinlog.cc:
  Port to Ia64
sql/mysqld.cc:
  FLUSH TABLES table_list
sql/net_pkg.cc:
  Port to Ia64
sql/procedure.h:
  Port to Ia64
sql/share/swedish/errmsg.OLD:
  FLUSH TABLES table_list
sql/slave.cc:
  Port to Ia64
sql/sql_acl.cc:
  Port to Ia64
sql/sql_analyse.cc:
  Port to Ia64
sql/sql_analyse.h:
  Port to Ia64
sql/sql_base.cc:
  FLUSH TABLES table_list
sql/sql_class.cc:
  Port to Ia64
sql/sql_class.h:
  Port to Ia64
sql/sql_parse.cc:
  Port to Ia64
sql/sql_rename.cc:
  Fix of RENAME
sql/sql_show.cc:
  Port to Ia64
sql/sql_string.cc:
  Port to Ia64
sql/sql_string.h:
  Port to Ia64
sql/sql_table.cc:
  Fix of RENAME
sql/sql_udf.cc:
  Port to Ia64
sql/sql_yacc.yy:
  FLUSH TABLES table_list
sql/table.cc:
  Port to Ia64
sql/thr_malloc.cc:
  Port to Ia64
sql/time.cc:
  Port to Ia64
sql/unireg.cc:
  Port to Ia64
2000-08-22 00:18:32 +03:00
71c868ac7b Language cleanups.
Docs/manual.texi:
  Language cleanups. "determinate"
  RENAME TABLE .. TO ..
2000-08-21 14:53:51 -05:00
756b6b178f Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-08-21 10:53:31 -06:00
862d91929f Delete: sql/share/charsets/win1251.conf
win1251ukr.conf ctype(165)=10, was 1; ctype(180)=10, was 2
cp1251.conf     ctype(160)=0, was 48


sql/share/charsets/cp1251.conf:
  ctype(160)=0, was 48
sql/share/charsets/win1251ukr.conf:
  ctype(165)=10, was 1; ctype(180)=10, was 2
BitKeeper/deleted/.del-win1251.conf:
  Delete: sql/share/charsets/win1251.conf
2000-08-21 17:30:37 +04:00
d36c774f39 Merge
sql/sql_yacc.yy:
  Auto merged
sql/sql_parse.cc:
  merged
2000-08-21 15:54:41 +04:00
44170cb982 sql_yacc.yy => CREATE TABLE (... COLLECTION ... ) syntax
sql/item_func.h:
  cosmetic changes
sql/sql_parse.cc:
  cosmetic changes
sql/sql_yacc.yy:
  CREATE TABLE (... COLLECTION ... ) syntax
2000-08-21 15:35:27 +04:00
90bc6094ee Merge of last changes
sql/ChangeLog:
  Update of last changes
sql/mysql_priv.h:
  RENAME TABLE
sql/sql_parse.cc:
  RENAME TABLE ; MORE Access checks; Faster alloc
2000-08-21 03:07:54 +03:00
2019201ba6 Merge monty@work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
include/global.h:
  Auto merged
2000-08-21 03:01:16 +03:00
55c5016f92 RENAME TABLE table_name TO new_table_name ; Faster Alloc
Small bug fixes


myisammrg/myrg_rfirst.c:
  Change mode to -rw-rw-r--
myisammrg/myrg_rlast.c:
  Change mode to -rw-rw-r--
myisammrg/myrg_rnext.c:
  Change mode to -rw-rw-r--
myisammrg/myrg_rprev.c:
  Change mode to -rw-rw-r--
Docs/manual.texi:
  Update of RENAME
configure.in:
  Portability fix
include/global.h:
  Fix for ODBC and Intel Ia64
include/mysqld_error.h:
  RENAME TABLE
myisam/myisamchk.c:
  Faster --fast
myisammrg/myrg_queue.c:
  Bug fix
myisammrg/myrg_rkey.c:
  Portability fix
sql-bench/test-insert.sh:
  Fix for duplicate key test
sql/ChangeLog:
  Changelog
sql/Makefile.am:
  RENAME TABLE
sql/item_sum.cc:
  Fix for COUNT(DISTINCT)
sql/lock.cc:
  RENAME TABLE
sql/share/czech/errmsg.sys:
  RENAME TABLE
sql/share/czech/errmsg.txt:
  RENAME TABLE
sql/share/danish/errmsg.sys:
  RENAME TABLE
sql/share/danish/errmsg.txt:
  RENAME TABLE
sql/share/dutch/errmsg.sys:
  RENAME TABLE
sql/share/dutch/errmsg.txt:
  RENAME TABLE
sql/share/english/errmsg.sys:
  RENAME TABLE
sql/share/english/errmsg.txt:
  RENAME TABLE
sql/share/estonia/errmsg.sys:
  RENAME TABLE
sql/share/estonia/errmsg.txt:
  RENAME TABLE
sql/share/french/errmsg.sys:
  RENAME TABLE
sql/share/french/errmsg.txt:
  RENAME TABLE
sql/share/german/errmsg.sys:
  RENAME TABLE
sql/share/german/errmsg.txt:
  RENAME TABLE
sql/share/greek/errmsg.sys:
  RENAME TABLE
sql/share/greek/errmsg.txt:
  RENAME TABLE
sql/share/hungarian/errmsg.sys:
  RENAME TABLE
sql/share/hungarian/errmsg.txt:
  RENAME TABLE
sql/share/italian/errmsg.sys:
  RENAME TABLE
sql/share/italian/errmsg.txt:
  RENAME TABLE
sql/share/japanese/errmsg.sys:
  RENAME TABLE
sql/share/japanese/errmsg.txt:
  RENAME TABLE
sql/share/korean/errmsg.sys:
  RENAME TABLE
sql/share/korean/errmsg.txt:
  RENAME TABLE
sql/share/norwegian-ny/errmsg.txt:
  RENAME TABLE
sql/share/norwegian/errmsg.txt:
  RENAME TABLE
sql/share/polish/errmsg.sys:
  RENAME TABLE
sql/share/polish/errmsg.txt:
  RENAME TABLE
sql/share/portuguese/errmsg.sys:
  RENAME TABLE
sql/share/portuguese/errmsg.txt:
  RENAME TABLE
sql/share/romania/errmsg.sys:
  RENAME TABLE
sql/share/romania/errmsg.txt:
  RENAME TABLE
sql/share/romanian/errmsg.txt:
  ***MISSING WEAVE***
sql/share/russian/errmsg.sys:
  RENAME TABLE
sql/share/russian/errmsg.txt:
  RENAME TABLE
sql/share/slovak/errmsg.sys:
  RENAME TABLE
sql/share/slovak/errmsg.txt:
  RENAME TABLE
sql/share/spanish/errmsg.sys:
  RENAME TABLE
sql/share/spanish/errmsg.txt:
  RENAME TABLE
sql/share/swedish/errmsg.OLD:
  RENAME TABLE
sql/share/swedish/errmsg.sys:
  RENAME TABLE
sql/share/swedish/errmsg.txt:
  RENAME TABLE
sql/slave.cc:
  Faster alloc
sql/sql_base.cc:
  RENAME TABLE
sql/sql_class.cc:
  Faster alloc
sql/sql_class.h:
  Faster alloc
sql/sql_insert.cc:
  Fix bug in INSERT ... SELECT to BDB table
sql/sql_lex.h:
  RENAME TABLE
sql/sql_select.cc:
  Faster alloc
sql/sql_show.cc:
  Faster alloc
sql/sql_table.cc:
  RENAME TABLE
sql/sql_yacc.yy:
  RENAME TABLE
sql/thr_malloc.cc:
  Faster alloc
sql/unireg.h:
  RENAME TABLE
strings/ctype-sjis.c:
  Portability fix
2000-08-21 03:00:52 +03:00
6d40bcef37 Merge jcole@jcole:/home/jcole/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
2000-08-19 19:58:16 -05:00
628a4f67e1 mysql.spec.sh - added libmysqlclient_r
support-files/mysql.spec.sh:
  - added libmysqlclient_r
2000-08-19 23:36:05 +02:00
07c83f8440 Language Corrections.
Docs/manual.texi:
  Catching up on language corrections.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-08-19 13:05:35 -05:00
ada1183947 Change the behavior of --enable-thread-safe-client. It now builds
both a non-threaded libmysqlclient and a threaded libmysqlclient_r.


Makefile.am:
  - build libmysqlclient_r in a separate directory
include/global.h:
  - build libmysqlclient_r in a separate directory
libmysql/Makefile.am:
  - build libmysqlclient_r in a separate directory
2000-08-18 14:49:31 -04:00
259c7ea0f8 Merge monty@work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
myisam/ft_eval.c:
  Auto merged
2000-08-18 17:38:57 +03:00
4fedb12080 Force bitkeeper into sync 2000-08-18 17:38:24 +03:00
41814b70d6 myisam/ft_* bugfix
myisam/ft_search.c:
  small bugfix
myisam/ft_eval.c:
  HA_KEY_NOT_FOUND => HA_END_OF_FILE
myisam/ft_test1.c:
  HA_KEY_NOT_FOUND => HA_END_OF_FILE
2000-08-18 15:05:36 +04:00
d000fde588 Merge
myisammrg/Makefile.am:
  Auto merged
support-files/Makefile.am:
  Auto merged
sql/ha_myisam.cc:
  Merge against serg's changes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-08-18 13:09:26 +03:00
f053a2846a Removed blanks 2000-08-18 12:56:57 +03:00
6a5d4b6b80 Updated benchmark and results for PostgreSQL 7.0.2
Added more status to the MyISAM files to avoid checking files that
has already been checked.


Docs/manual.texi:
  Turn off RCS flag
BitKeeper/deleted/.del-ATIS-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.2.14_5.0_i686:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
  ***MISSING WEAVE***
dbug/Makefile.am:
  Fix for bitkeeper
extra/Makefile.am:
  Fix for bitkeeper
heap/Makefile.am:
  Fix for bitkeeper
isam/Makefile.am:
  Fix for bitkeeper
merge/Makefile.am:
  Fix for bitkeeper
myisam/ChangeLog:
  Added more status for the MyISAM table
myisam/Makefile.am:
  Fix for bitkeeper
myisam/mi_check.c:
  Added more status for the MyISAM table
myisam/mi_extra.c:
  Added more status for the MyISAM table
myisam/mi_page.c:
  Added more status for the MyISAM table
myisam/myisamchk.c:
  Added more status for the MyISAM table
myisammrg/Makefile.am:
  Fix for bitkeeper
mysys/Makefile.am:
  Fix for bitkeeper
readline/Makefile.am:
  Fix for bitkeeper
regex/Makefile.am:
  Fix for bitkeeper
scripts/Makefile.am:
  Fix for bitkeeper
sql-bench/Comments/Access.crash-me:
  Comments for crash-me
sql-bench/Comments/Adabas.crash-me:
  Comments for crash-me
sql-bench/Comments/Empress.crash-me:
  Comments for crash-me
sql-bench/Comments/Informix.crash-me:
  Comments for crash-me
sql-bench/Comments/postgres.benchmark:
  Updated documentation
sql-bench/Comments/postgres.crash-me:
  Comments for crash-me
sql-bench/Makefile.am:
  Added the Comments directory
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/ATIS-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/RUN-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/alter-table-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/big-tables-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/connect-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/insert-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/select-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/Results/wisconsin-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
  Version number fix
sql-bench/compare-results.sh:
  Fix bug in --relative
sql-bench/test-insert.sh:
  Fix for duplicate key test
sql/ha_myisam.cc:
  Don't check checked tables
sql/lex.h:
  Remove MAX as a reserved keyword
sql/sql_yacc.yy:
  Remove MAX as a reserved keyword
strings/Makefile.am:
  Fix for bitkeeper
support-files/Makefile.am:
  Fix for bitkeeper
tests/Makefile.am:
  Fix for bitkeeper
vio/Makefile.am:
  Fix for bitkeeper
2000-08-18 12:48:00 +03:00
340794dd29 Merge
sql/handler.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
2000-08-17 19:43:38 +04:00