Commit graph

195806 commits

Author SHA1 Message Date
unknown
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
monty@donna.mysql.com
9c1ecff8ec Merge 2000-08-18 13:09:26 +03:00
unknown
f053a2846a Removed blanks 2000-08-18 12:56:57 +03:00
monty@donna.mysql.com
fab1abb458 Removed blanks 2000-08-18 12:56:57 +03:00
unknown
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
monty@donna.mysql.com
a753a3a2ce 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.
2000-08-18 12:48:00 +03:00
unknown
340794dd29 Merge
sql/handler.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
2000-08-17 19:43:38 +04:00
serg@infomag.ape.relarn.ru
b231fdefca Merge 2000-08-17 19:43:38 +04:00
unknown
f02d7772d9 Many MATCH'es per query now allowed (i.e. AND's and OR's now work, but
slow - full table scan); ORDER BY now works with MATCH (slow, full table
scan)


myisam/ft_eval.c:
  ft_read_next compatibility
myisam/ft_test1.c:
  ft_read_next compatibility
include/ft_global.h:
  ft_read_next redesigned, ft_get_relevance introduced
sql/ha_myisam.cc:
  Many MATCH'es per query now allowed
sql/ha_myisam.h:
  Many MATCH'es per query now allowed
sql/handler.h:
  Many MATCH'es per query now allowed
sql/item_func.cc:
  Many MATCH'es per query now allowed
sql/item_func.h:
  Many MATCH'es per query now allowed
sql/sql_select.cc:
  Many MATCH'es per query now allowed
myisam/ft_search.c:
  HA_KEY_NOT_FOUND => HA_END_OF_FILE
2000-08-17 19:30:36 +04:00
serg@infomag.ape.relarn.ru
2006b4c551 Many MATCH'es per query now allowed (i.e. AND's and OR's now work, but
slow - full table scan); ORDER BY now works with MATCH (slow, full table
scan)
2000-08-17 19:30:36 +04:00
unknown
f70441c7c3 Merge tim@work:/home/bk/mysql
into localhost.polyesthetic.msg:/usr/local/src/my/work


sql/sql_table.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-08-16 18:25:34 -04:00
tim@localhost.polyesthetic.msg
354da85ad5 Merge tim@work:/home/bk/mysql
into localhost.polyesthetic.msg:/usr/local/src/my/work
2000-08-16 18:25:34 -04:00
unknown
34d0db7640 Server core dumped if ALTER TABLE SET DEFAULT was called on a blob
field.


sql/sql_table.cc:
  - error if ALTER TABLE SET DEFAULT called on blob field
2000-08-16 18:20:22 -04:00
tim@localhost.polyesthetic.msg
ee445de997 Server core dumped if ALTER TABLE SET DEFAULT was called on a blob
field.
2000-08-16 18:20:22 -04:00
unknown
c4543517a3 Merge
sql-bench/server-cfg.sh:
  Auto merged
Docs/manual.texi:
  Merged of manual
2000-08-17 01:20:21 +03:00
monty@donna.mysql.com
29456f6e1c Merge 2000-08-17 01:20:21 +03:00
unknown
7496ec3173 Additions for CHECK table + update of benchmarks
Docs/manual.texi:
  Updated for 3.23.23
myisam/mi_check.c:
  Fix for CHECK table
sql-bench/bench-init.pl.sh:
  Fix of benchmarks for PostgreSQL 7.0.2
sql-bench/server-cfg.sh:
  Fix of benchmarks for PostgreSQL 7.0.2
sql-bench/test-insert.sh:
  Fix of benchmarks for PostgreSQL 7.0.2
sql-bench/test-select.sh:
  Fix of benchmarks for PostgreSQL 7.0.2
sql/ha_myisam.cc:
  Fix for CHECK table
sql/handler.h:
  Fix for CHECK table
sql/lex.h:
  Fix for CHECK table
sql/sql_load.cc:
  Fix bug in delayed keys
sql/sql_table.cc:
  Fix for CHECK table
sql/sql_yacc.yy:
  Fix for CHECK table
sql/structs.h:
  Fix wrong type
2000-08-17 01:05:02 +03:00
monty@donna.mysql.com
c5842d42f6 Additions for CHECK table + update of benchmarks 2000-08-17 01:05:02 +03:00
unknown
430cf7068c Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-08-16 13:12:36 -06:00
sasha@mysql.sashanet.com
31c56777c4 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-08-16 13:12:36 -06:00
unknown
5a88aeb613 test dummy change
Docs/net_doc.txt:
  added new line to make a dummy change
2000-08-16 13:10:56 -06:00
sasha@mysql.sashanet.com
10b2d286c7 test dummy change 2000-08-16 13:10:56 -06:00
unknown
dd38ab7583 Fix "dosen't" for someone who mailed us. :)
Docs/manual.texi:
  Fix "dosen't"
dbug/monty.doc:
  Fix "dosen't"
isam/isamchk.c:
  Fix "dosen't"
libmysql/libmysql.c:
  Fix "dosen't"
sql-bench/server-cfg.sh:
  Fix "dosen't"
sql/sql_base.cc:
  Fix "dosen't"
sql/sql_test.cc:
  Fix "dosen't"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-08-16 04:17:40 -05:00
jcole@jcole.burghcom.com
3eaa2494ef Fix "dosen't" for someone who mailed us. :) 2000-08-16 04:17:40 -05:00
unknown
3843d8e5a7 Merge
BitKeeper/etc/logging_ok:
  Auto merged
2000-08-16 13:03:58 +04:00
serg@infomag.ape.relarn.ru
8b86536844 Merge 2000-08-16 13:03:58 +04:00
unknown
379b269507 updated changes in the manual
Docs/manual.texi:
  Updated the changes in 3.23.22 and 3.23.23
2000-08-15 23:32:26 -06:00
sasha@mysql.sashanet.com
7d0072ebeb updated changes in the manual 2000-08-15 23:32:26 -06:00
unknown
e318f3a607 Delayed keys + portability fixes
client/Makefile.am:
  Fix for make/bitkeeper
configure.in:
  Fix for SCO and SHOW PROCESSLIST
include/Makefile.am:
  Fix for make/bitkeeper
libmysql/Makefile.am:
  Fix for make/bitkeeper
myisam/mi_check.c:
  Fixes for delayed key handling
sql-bench/Makefile.am:
  Fix for make/bitkeeper
sql/Makefile.am:
  Fix for make/bitkeeper
sql/sql_insert.cc:
  Added delay key creation to INSERT .. SELECT
2000-08-16 05:14:02 +03:00
monty@donna.mysql.com
2f450e4fc7 Delayed keys + portability fixes 2000-08-16 05:14:02 +03:00
unknown
6388f02bbf Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto merged
2000-08-15 17:49:43 -06:00
sasha@mysql.sashanet.com
1777d4dbbe Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-08-15 17:49:43 -06:00
unknown
791b5d98b1 fix for the fatal bug in LOAD TABLE FROM MASTER
sql/slave.cc:
  fixed a bug in LOAD TABLE FROM MASTER - the table was not being locked during repair
sql/sql_parse.cc:
  reverse the bookkeeping so that sql_parse.cc now matches Monty's
2000-08-15 17:49:07 -06:00
sasha@mysql.sashanet.com
ac9de478db fix for the fatal bug in LOAD TABLE FROM MASTER 2000-08-15 17:49:07 -06:00
unknown
dd9b0365b2 Language corrections to:
manual.texi
  internals.texi

In the wake of Monty's latest revisions. :)


Docs/internals.texi:
  Language and readability fixups.
Docs/manual.texi:
  Various language fixups, etc.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-08-15 17:27:46 -05:00
jcole@jcole.burghcom.com
c442a5dd2a Language corrections to:
manual.texi
  internals.texi

In the wake of Monty's latest revisions. :)
2000-08-15 17:27:46 -05:00
unknown
51eba25ab8 testing bk/make for Monty
sql/slave.cc:
  test change
2000-08-15 13:42:28 -06:00
sasha@mysql.sashanet.com
b617e9baa8 testing bk/make for Monty 2000-08-15 13:42:28 -06:00
unknown
4d820053db Merge
BitKeeper/etc/logging_ok:
  Auto merged
2000-08-15 21:52:42 +04:00
serg@infomag.ape.relarn.ru
bf617db818 Merge 2000-08-15 21:52:42 +04:00
unknown
771d68b520 bookkeeping
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  another bookkeeping commit during merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-08-15 11:52:18 -06:00
sasha@mysql.sashanet.com
eec37a5fc2 bookkeeping 2000-08-15 11:52:18 -06:00
unknown
0835169334 another bookkeeping commit - will not be pushed
sql/sql_parse.cc:
  bookkeeping check in, needed to be able to pull Monty's version
2000-08-15 11:46:20 -06:00
sasha@mysql.sashanet.com
5e996d2753 another bookkeeping commit - will not be pushed 2000-08-15 11:46:20 -06:00
unknown
264ae115fd logging_ok Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2000-08-15 21:45:56 +04:00
serg@infomag.ape.relarn.ru
563fdb8e2a logging_ok Logging to logging@openlogging.org accepted 2000-08-15 21:45:56 +04:00
unknown
6183695e8a bookkeeping commit - bk will not let me pull Monty's changes until I commit mine to my repository - this will not be pushed
sql/mysqld.cc:
  added explict net->timeout set to net_read_timeout before handshake
2000-08-15 11:42:09 -06:00
sasha@mysql.sashanet.com
57ef3cccf3 bookkeeping commit - bk will not let me pull Monty's changes until I commit mine to my repository - this will not be pushed 2000-08-15 11:42:09 -06:00
unknown
c53d371cc9 Removed automaticly created files from Bitkeeper
BitKeeper/deleted/.del-my_global.h:
  ***MISSING WEAVE***
2000-08-15 20:10:43 +03:00
monty@donna.mysql.com
883042ba1e Removed automaticly created files from Bitkeeper 2000-08-15 20:10:43 +03:00