Commit graph

3311 commits

Author SHA1 Message Date
unknown
f9df684760 Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqln
2002-02-10 04:51:47 +02:00
unknown
e370bdeeb6 srv0srv.c:
If the default character set was set to non-latin1 then the collation order of DATA_CHAR and DATA_VARCHAR was not defined, and foreign key system tables did not work, because they contain DATA_VARCHAR columns


innobase/srv/srv0srv.c:
  If the default character set was set to non-latin1 then the collation order of DATA_CHAR and DATA_VARCHAR was not defined, and foreign key system tables did not work, because they contain DATA_VARCHAR columns
2002-02-10 04:50:46 +02:00
unknown
61b769d94a Fix for customer build 2002-02-10 02:28:24 +02:00
unknown
c9a4dde5de Add forgotten argument to --version-suffix 2002-02-10 00:34:05 +02:00
unknown
6f11331945 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-02-09 13:59:30 -07:00
unknown
ff3b98e631 updated test suite to be able to run 3.23 master and 4.0 slave
got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.


client/mysqltest.c:
  added require_version
mysql-test/mysql-test-run.sh:
  added --master-binary=,--slave-binary=,--old-master options
  sleep_until_file_exists -> sleep_until_file_created
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication from 3.23 master
2002-02-09 13:58:53 -07:00
unknown
84c71cf778 added options 'version-suffix' to Do-compile
Build-tools/Do-compile:
  added options 'version-suffix'
2002-02-09 17:14:58 +02:00
unknown
581edc5475 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-02-09 04:01:17 +02:00
unknown
f7c085efe3 Removed compiler warnings
Docs/manual.texi:
  Cleanup
myisam/myisampack.c:
  Removed warning
sql/handler.cc:
  cleanup
sql/slave.cc:
  Removed not used var
2002-02-09 04:00:24 +02:00
unknown
4bb7802225 dict0crea.c:
Still a little better error message for Harald Fuchs


innobase/dict/dict0crea.c:
  Still a little better error message for Harald Fuchs
2002-02-08 23:35:50 +02:00
unknown
17b2cd98c9 dict0crea.c:
Add some error messages to help in tracking Harald Fuchs' foreign key failure


innobase/dict/dict0crea.c:
  Add some error messages to help in tracking Harald Fuchs' foreign key failure
2002-02-08 23:24:36 +02:00
unknown
7380df3f84 small bug fix in max queries per hour 2002-02-08 17:44:50 +02:00
unknown
f5e6f0e7ca bugfix for max_user_connections 2002-02-08 10:18:32 +00:00
unknown
6259917372 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-02-08 09:44:41 +00:00
unknown
49266c90a2 merge
sql/mysql_priv.h:
  Auto merged
2002-02-08 03:29:29 +02:00
unknown
0f9932a162 Fix some bugs introduced with the new my_getopt
Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'


Docs/manual.texi:
  Changelog
configure.in:
  Cleanup
myisam/myisamchk.c:
  Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
  Test for bugfix
mysql-test/r/rpl000001.result:
  fix wrong result
mysql-test/r/select.result:
  Fix things after fixing ignore index()
mysql-test/r/select_found.result:
  Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
  Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
  fix wrong result
mysql-test/t/select_found.test:
  Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
  Added counting of rollback's and commits
sql/mysql_priv.h:
  Added counting of rollback's and commits
sql/mysqld.cc:
  Added counting of rollback's and commits
sql/sql_select.cc:
  Fixed bug in 'SELECT 0 LIMIT 0'
  Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
2002-02-08 03:21:34 +02:00
unknown
83d50c17b7 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-02-07 15:30:44 -07:00
unknown
0d87650934 fixes for slave backward compat
fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE, 
which is still buggy. Will push this one after the pull/merge


mysql-test/r/rpl000001.result:
  fixed bug in result
sql/log_event.cc:
  fixes for slave backward compat
sql/log_event.h:
  fixes for slave backward compat
sql/mysql_priv.h:
  fixes for slave backward compat
sql/net_serv.cc:
  fixes for slave backward compat
sql/repl_failsafe.cc:
  fixed bug in LOAD DATA FROM MASTER
sql/slave.cc:
  fixes for slave backward compat
sql/slave.h:
  fixes for slave backward compat
sql/sql_load.cc:
  fixes for slave backward compat
2002-02-07 15:29:46 -07:00
unknown
73edf19b0c Fixed results after Heikki's last change 2002-02-07 23:46:29 +02:00
unknown
007470d8c5 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
sql/ha_innobase.cc:
  Auto merged
2002-02-07 21:53:09 +02:00
unknown
3942e44524 Update to autoconf 2.52
Fix of InnoDB variables in SHOW VARIABLES
Fix for ALTER TABLE and InnoDB


BUILD/FINISH.sh:
  Update to autoconf 2.52
BUILD/SETUP.sh:
  Update to autoconf 2.52
BUILD/compile-alpha:
  Update to autoconf 2.52
BUILD/compile-pentium-gcov:
  Update to autoconf 2.52
BUILD/compile-pentium-gprof:
  Update to autoconf 2.52
BUILD/compile-pentium:
  Update to autoconf 2.52
Docs/manual.texi:
  Changelog
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
client/Makefile.am:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
mysql-test/r/innodb.result:
  Update of InnoDB Cardinality values
mysys/Makefile.am:
  Update to autoconf 2.52
scripts/Makefile.am:
  Update to autoconf 2.52
sql/ha_innobase.cc:
  Fix of InnoDB variables in SHOW VARIABLES
sql/ha_innobase.h:
  Fix of InnoDB variables in SHOW VARIABLES
sql/sql_table.cc:
  Fix for ALTER TABLE and InnoDB
support-files/my-huge.cnf.sh:
  Fixed typo
support-files/my-large.cnf.sh:
  Fixed typo
support-files/my-medium.cnf.sh:
  Fixed typo
support-files/my-small.cnf.sh:
  Fixed typo
2002-02-07 21:34:35 +02:00
unknown
6340283614 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-02-07 18:28:24 +02:00
unknown
90a76d688a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-02-07 13:50:42 +02:00
unknown
7c0b23e6f3 small typo fix 2002-02-07 13:50:04 +02:00
unknown
9a052e273f rem0cmp.c:
Prevent a foreign key constraint references between INT columns where the signedness is different


innobase/rem/rem0cmp.c:
  Prevent a foreign key constraint references between INT columns where the signedness is different
2002-02-07 12:05:02 +02:00
unknown
dc7af9f035 Bug fixes and new functionality added in my_getopt and myisamchk
include/my_getopt.h:
  Removed a member from my_getopt struct.
myisam/myisamchk.c:
  pdated myisamchk. More features in use from my_getopt
mysys/my_getopt.c:
  Fixed a bug in handle_options(). Short options were not tested
  whether existed when given from the command line. Fixed a bug
  in getopt_ll, got division by zero in some cases. Added new functions
  my_print_help() and my_print_variables() to be used by mysql server
  and most clients.
2002-02-06 17:22:43 +02:00
unknown
bb41d5308b Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/opt_sum.cc:
  Auto merged
2002-02-06 11:49:09 +02:00
unknown
26dfae652f Remove old test suite in xml format
BitKeeper/deleted/.del-README~877d76bcd19f7193:
  Delete: mysql-test/xml/README
BitKeeper/deleted/.del-sel000001.xml~f0eb64c0346366db:
  Delete: mysql-test/xml/tests/sel000001.xml
BitKeeper/deleted/.del-sel000002.xml~8cd06da5293a7147:
  Delete: mysql-test/xml/tests/sel000002.xml
BitKeeper/deleted/.del-sel000003.xml~1a622b8d30d7ade8:
  Delete: mysql-test/xml/tests/sel000003.xml
BitKeeper/deleted/.del-sel000004.xml~515488ef221523d9:
  Delete: mysql-test/xml/tests/sel000004.xml
BitKeeper/deleted/.del-sel000005.xml~a6344e46ba572dc3:
  Delete: mysql-test/xml/tests/sel000005.xml
BitKeeper/deleted/.del-sel000006.xml~8ad8f44f49b21246:
  Delete: mysql-test/xml/tests/sel000006.xml
BitKeeper/deleted/.del-sel000007.xml~bfcb6d85276be7e8:
  Delete: mysql-test/xml/tests/sel000007.xml
BitKeeper/deleted/.del-sel000008.xml~1d6082f0905c51b6:
  Delete: mysql-test/xml/tests/sel000008.xml
BitKeeper/deleted/.del-sel000009.xml~8677613dc624cb0c:
  Delete: mysql-test/xml/tests/sel000009.xml
BitKeeper/deleted/.del-sel000010.xml~9b98c9cce8fac145:
  Delete: mysql-test/xml/tests/sel000010.xml
BitKeeper/deleted/.del-sel000011.xml~432156d127cbd22f:
  Delete: mysql-test/xml/tests/sel000011.xml
BitKeeper/deleted/.del-sel000012.xml~a410d08dc4cfee11:
  Delete: mysql-test/xml/tests/sel000012.xml
BitKeeper/deleted/.del-sel000013.xml~2717cbfbe5730174:
  Delete: mysql-test/xml/tests/sel000013.xml
BitKeeper/deleted/.del-sel000014.xml~bcf55df6a036bd8f:
  Delete: mysql-test/xml/tests/sel000014.xml
BitKeeper/deleted/.del-sel000015.xml~b72689a8f9b21372:
  Delete: mysql-test/xml/tests/sel000015.xml
BitKeeper/deleted/.del-sel000016.xml~32f1ef2e3d214be0:
  Delete: mysql-test/xml/tests/sel000016.xml
BitKeeper/deleted/.del-sel000017.xml~81423597605ff77f:
  Delete: mysql-test/xml/tests/sel000017.xml
BitKeeper/deleted/.del-sel000018.xml~82e2e7bde83f56d8:
  Delete: mysql-test/xml/tests/sel000018.xml
BitKeeper/deleted/.del-sel000019.xml~c0f0b05e481b90e7:
  Delete: mysql-test/xml/tests/sel000019.xml
BitKeeper/deleted/.del-sel000020.xml~8849bbf91a4fd5ec:
  Delete: mysql-test/xml/tests/sel000020.xml
BitKeeper/deleted/.del-sel000021.xml~2763b87c1549ba87:
  Delete: mysql-test/xml/tests/sel000021.xml
BitKeeper/deleted/.del-sel000022.xml~da2083ef423ae39a:
  Delete: mysql-test/xml/tests/sel000022.xml
BitKeeper/deleted/.del-sel000023.xml~11993b379b9838be:
  Delete: mysql-test/xml/tests/sel000023.xml
BitKeeper/deleted/.del-sel000024.xml~dd067aa28220fa4c:
  Delete: mysql-test/xml/tests/sel000024.xml
BitKeeper/deleted/.del-sel000025.xml~3e766aa1e43b303:
  Delete: mysql-test/xml/tests/sel000025.xml
BitKeeper/deleted/.del-sel000026.xml~15145e496417646f:
  Delete: mysql-test/xml/tests/sel000026.xml
BitKeeper/deleted/.del-README~cd4bb681e5a0cd10:
  Delete: mysql-test/xml/xsl/README
BitKeeper/deleted/.del-sel000027.xml~95e7de3e9934b570:
  Delete: mysql-test/xml/tests/sel000027.xml
BitKeeper/deleted/.del-sel000028.xml~c72bfec6600949b:
  Delete: mysql-test/xml/tests/sel000028.xml
BitKeeper/deleted/.del-sel000029.xml~3aba1eb23ef86c9e:
  Delete: mysql-test/xml/tests/sel000029.xml
BitKeeper/deleted/.del-sel000030.xml~c2b25781eefaee9:
  Delete: mysql-test/xml/tests/sel000030.xml
BitKeeper/deleted/.del-mysqltest.xsl~1b8f6ec4f1b5f634:
  Delete: mysql-test/xml/xsl/mysqltest.xsl
sql/opt_sum.cc:
  Fixed typo
2002-02-06 01:12:03 +02:00
unknown
9adfd2e8d9 manual.texi:
Updated general manual about InnoDB locking and CHECK TABLE


Docs/manual.texi:
  Updated general manual about InnoDB locking and CHECK TABLE
2002-02-05 11:37:33 +02:00
unknown
70634523d4 ha_innobase.cc:
Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock


sql/ha_innobase.cc:
  Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock
2002-02-05 00:16:38 +02:00
unknown
9871a6d080 Many files:
Small improvements
row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
ha_innobase.cc:
  Some fine-tuning of optimization


sql/ha_innobase.cc:
  Some fine-tuning of optimization
innobase/include/log0recv.h:
  Small improvements
innobase/include/mem0mem.h:
  Small improvements
innobase/include/mem0pool.h:
  Small improvements
innobase/include/row0mysql.h:
  Small improvements
innobase/include/srv0srv.h:
  Small improvements
innobase/include/trx0trx.h:
  Small improvements
innobase/buf/buf0lru.c:
  Small improvements
innobase/fil/fil0fil.c:
  Small improvements
innobase/log/log0recv.c:
  Small improvements
innobase/mem/mem0mem.c:
  Small improvements
innobase/mem/mem0pool.c:
  Small improvements
innobase/row/row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
innobase/srv/srv0srv.c:
  Small improvements
innobase/srv/srv0start.c:
  Small improvements
innobase/trx/trx0purge.c:
  Small improvements
innobase/trx/trx0trx.c:
  Small improvements
2002-02-04 23:55:41 +02:00
unknown
0d4a628348 A few required additions to XML docbook fixup script.
Added url to success story form in manual.


Docs/Support/docbook-fixup.pl:
  A few required additions to script.
Docs/manual.texi:
  Added url to success story form.
2002-02-04 14:28:17 +10:00
unknown
3518de828d ha_innobase.cc:
Fix the crashes reported by Peter; SHOW CREATE does not call external_lock before calling ::info, and consequently the trx struct in prebuilt is obsolete; setting trx->op_info caused erratic memory corruption in mysqldump


sql/ha_innobase.cc:
  Fix the crashes reported by Peter; SHOW CREATE does not call external_lock before calling ::info, and consequently the trx struct in prebuilt is obsolete; setting trx->op_info caused erratic memory corruption in mysqldump
2002-02-03 15:21:15 +02:00
unknown
9855a07b4a Merge heikki@work.mysql.com:/home/my/mysql
into donna.mysql.fi:/home/heikki/mysqln
2002-02-03 15:15:13 +02:00
unknown
3a2c8b9a1b manual.texi fix bad edit
Docs/manual.texi:
  fix bad edit
2002-02-02 17:26:53 -06:00
unknown
48a25a2477 manual.texi fix typos pointed out by mailing list reader
Docs/manual.texi:
  typos pointed out by mailing list reader
2002-02-02 17:24:11 -06:00
unknown
9bc97643c8 manual.texi fix too short/too long ellipses
Docs/manual.texi:
  fix too short/too long ellipses
2002-02-01 14:38:00 -06:00
unknown
f8cbf8f986 BK makes me problems.
I did not know I can't do chmod ...
So, it killed some of my changes. 
But I am smarter, and as I have first saved my work, before BK ruined
it, so here it comes ...


BitKeeper/etc/ignore:
  Added mysql-test/r/rpl000001.eval to the ignore list
2002-02-01 21:45:23 +02:00
unknown
1c7dbd8c89 Changes for the max queries per hour 2002-02-01 20:53:24 +02:00
unknown
bd35c06821 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-02-01 20:31:17 +02:00
unknown
6d862d0f70 Changes required for maximum queries per hour 2002-02-01 15:40:38 +02:00
unknown
552656c3ba fixed wrong DBUG_ASSERT() in IO_CACHE
fixed apparent typo in opt_sum.cc
I will push this Changeset although it fails select test - failing select 
is better than the code that does not compile.


mysql-test/r/rpl000001.result:
  updated result
mysys/mf_iocache2.c:
  fixed wrong DBUG_ASSERT()
sql/opt_sum.cc:
  fixed an apparent typo to make it compile
2002-01-31 16:17:24 -07:00
unknown
8612588aeb Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0


sql/item_func.cc:
  Auto merged
sql/slave.cc:
  Auto merged
2002-01-31 11:04:49 -07:00
unknown
1d76e90c1b temporary commit to pull Monty's changes
include/my_global.h:
  added dbug_volatile
mysys/mf_iocache2.c:
  some debugging code to investigate failed assert in my_b_append_tell()
sql/item_func.cc:
  fixed logging bug in DO RELEASE_LOCK()
2002-01-31 11:02:11 -07:00
unknown
f5a75e7965 manual.texi minor cleanups, typo fixes
Docs/manual.texi:
  minor cleanups
2002-01-30 20:36:59 -06:00
unknown
83c83a0223 Fixes for new getopt
Bug fix when using --no-deaults
Sets ref_length to right value (faster rnd_pos() handling in InnoDB).
Fixed problem with multi-table-delete and InnoDB
Fixed problem with truncate table, which required a COMMIT before.
Fixed multi-table-delete bug with InnoDB.
Remove not used index from EXPLAIN


Docs/manual.texi:
  ChangeLog
include/my_getopt.h:
  Removed compiler warnings
myisam/myisamchk.c:
  Fixes for new getopt
mysql-test/r/explain.result:
  Updated test results
mysql-test/r/innodb.result:
  Updated test results
mysql-test/r/join.result:
  Updated test results
mysql-test/t/innodb.test:
  Updated test results
mysys/default.c:
  Bug fix when using --no-defaults
mysys/my_getopt.c:
  Fixes for new getopt
sql/ha_innodb.cc:
  Sets ref_length to right value (faster rnd_pos() handling).
  Fixed problem with multi-table-delete.
  Fixed problem with truncate table, which required a COMMIT before.
sql/opt_sum.cc:
  Remove not used index from EXPLAIN
sql/sql_cache.cc:
  Fixed core dump bug when not using query cache
sql/sql_select.cc:
  Remove not used index from EXPLAIN
2002-01-31 04:36:58 +02:00
unknown
85278245af Merge from 3.23.48 tree
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0rec.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/hash.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2002-01-30 16:37:47 +02:00
unknown
1ff678a903 btr0cur.c, ha_innobase.cc:
Fine-tune optimization parameters; in small tables the estimates are accurate; in big tables let us not be too optimistic about index selectivity


sql/ha_innobase.cc:
  Fine-tune optimization parameters; in small tables the estimates are accurate; in big tables let us not be too optimistic about index selectivity
innobase/btr/btr0cur.c:
  Fine-tune optimization parameters; in small tables the estimates are accurate; in big tables let us not be too optimistic about index selectivity
2002-01-30 16:29:15 +02:00
unknown
8a56717c4c Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-01-30 16:09:35 +02:00
unknown
bd454107a8 Fix in SHOW GRANTS: REFERENCE -> REFERENCES
Docs/manual.texi:
  changelog
sql/sql_acl.cc:
  Fix REFERENCE -> REFERENCES
2002-01-30 16:09:19 +02:00