Commit graph

1106 commits

Author SHA1 Message Date
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
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
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
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
94f7b7f33f mem0mem.c:
Add more diagnostic code to cath possible memory corruption


innobase/mem/mem0mem.c:
  Add more diagnostic code to cath possible memory corruption
2002-01-29 22:29:58 +02:00
unknown
a1940f03c6 page0page.ic:
Add an assert
dyn0dyn.h:
  Reduce stack consumption


innobase/include/dyn0dyn.h:
  Reduce stack consumption
innobase/include/page0page.ic:
  Add an assert
2002-01-29 14:16:31 +02:00
unknown
ac540e96a9 Many files:
Merge InnoDB-.48


sql/ha_innobase.cc:
  Merge InnoDB-.48
innobase/include/dict0dict.h:
  Merge InnoDB-.48
innobase/include/dict0mem.h:
  Merge InnoDB-.48
innobase/include/mem0dbg.h:
  Merge InnoDB-.48
innobase/include/mem0mem.h:
  Merge InnoDB-.48
innobase/include/que0que.h:
  Merge InnoDB-.48
innobase/include/row0mysql.h:
  Merge InnoDB-.48
innobase/include/srv0srv.h:
  Merge InnoDB-.48
innobase/include/trx0sys.h:
  Merge InnoDB-.48
innobase/include/trx0trx.h:
  Merge InnoDB-.48
innobase/include/mem0mem.ic:
  Merge InnoDB-.48
innobase/dict/dict0dict.c:
  Merge InnoDB-.48
innobase/dict/dict0mem.c:
  Merge InnoDB-.48
innobase/log/log0recv.c:
  Merge InnoDB-.48
innobase/mem/mem0dbg.c:
  Merge InnoDB-.48
innobase/mem/mem0mem.c:
  Merge InnoDB-.48
innobase/pars/lexyy.c:
  Merge InnoDB-.48
innobase/que/que0que.c:
  Merge InnoDB-.48
innobase/rem/rem0rec.c:
  Merge InnoDB-.48
innobase/row/row0mysql.c:
  Merge InnoDB-.48
innobase/row/row0sel.c:
  Merge InnoDB-.48
innobase/srv/srv0srv.c:
  Merge InnoDB-.48
innobase/sync/sync0arr.c:
  Merge InnoDB-.48
innobase/trx/trx0sys.c:
  Merge InnoDB-.48
innobase/trx/trx0trx.c:
  Merge InnoDB-.48
innobase/trx/trx0undo.c:
  Merge InnoDB-.48
2002-01-28 22:18:49 +02:00
unknown
842cc082f5 Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
mysql-test/mysql-test-run.sh:
  Auto merged
2002-01-05 12:51:21 +02:00
unknown
33c13daf63 ut0mem.c:
Better error message if we hit the max process size in FreeBSD


innobase/ut/ut0mem.c:
  Better error message if we hit the max process size in FreeBSD
2002-01-04 04:12:37 +02:00
unknown
2939543606 os0file.c:
Add better error message if access rights are wrong


innobase/os/os0file.c:
  Add better error message if access rights are wrong
2002-01-04 04:07:31 +02:00
unknown
04b45b178e srv0start.c:
Fix typo


innobase/srv/srv0start.c:
  Fix typo
2002-01-04 03:56:15 +02:00
unknown
be89cb717d os0file.c:
Improve error messages which may occur in installation


innobase/os/os0file.c:
  Improve error messages which may occur in installation
2002-01-04 01:35:49 +02:00
unknown
62c4fa399e merge with 3.23
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.texi:
  Auto merged
client/client_priv.h:
  Auto merged
extra/resolveip.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
client/mysqldump.c:
  Use local version in 4.0
configure.in:
  Use 4.0 code
2002-01-02 21:34:12 +02:00
unknown
f4fee3d90e Added macros for nice TIMESPEC usage.
Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.


BUILD/FINISH.sh:
  Fixes for gcc 3.0
BUILD/SETUP.sh:
  Fixes for gcc 3.0
Docs/manual.texi:
  Changelog + SIGNED/UNSIGNED casts.
Makefile.am:
  include BUILD scripts in source distribution.
client/Makefile.am:
  Fixes for gcc 3.0
client/mysql.cc:
  Cleanup
client/mysqldump.c:
  Changed 'K' to mean 'disable-keys' instead of 'no-disabled-keys'
client/readline.cc:
  Cleanup
configure.in:
  Include BUILD in source distrbution
extra/my_print_defaults.c:
  Cleanup
include/my_global.h:
  Fix for HPUX and setrlimit.
  Portability fix.
  Added macros for nice TIMESPEC usage.
innobase/include/dyn0dyn.h:
  Fix for AIX
libmysql/Makefile.shared:
  Added strxmov to libmysqld
libmysqld/examples/Makefile.am:
  Fixes for gcc 3.0
libmysqld/lib_vio.c:
  Cleanup
myisam/ft_dump.c:
  Portability fixes
myisam/ftdefs.h:
  Portability fixes
mysql-test/r/bdb.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/bigint.result:
  New test for SIGNED/UNSIGNED
mysql-test/r/fulltext.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/heap.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/innodb.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/isam.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/key.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/myisam.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/query_cache.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/select.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/show_check.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/type_ranges.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/t/bigint.test:
  New test for SIGNED/UNSIGNED
mysql-test/t/key.test:
  New test for SIGNED/UNSIGNED
mysql-test/t/query_cache.test:
  Test for FOUND_ROWS()
sql-bench/crash-me.sh:
  Safety fixes
sql/derror.cc:
  Cleanup
sql/ha_berkeley.h:
  New test for SIGNED/UNSIGNED
sql/ha_heap.h:
  New test for SIGNED/UNSIGNED
sql/ha_innobase.cc:
  New test for SIGNED/UNSIGNED
sql/ha_innobase.h:
  New test for SIGNED/UNSIGNED
sql/ha_isam.h:
  New test for SIGNED/UNSIGNED
sql/ha_myisam.cc:
  New test for SIGNED/UNSIGNED
sql/ha_myisam.h:
  New test for SIGNED/UNSIGNED
sql/handler.h:
  New test for SIGNED/UNSIGNED
sql/item_func.cc:
  Cleanup TIMESPEC usage
sql/item_func.h:
  Added SIGNED / UNSIGNED casts
sql/lex.h:
  Added SIGNED / UNSIGNED casts
sql/mysqld.cc:
  Cleanup TIMESPEC usage
sql/net_pkg.cc:
  Cleanup
sql/net_serv.cc:
  Fixed core dump bug in net_clear()
sql/slave.cc:
  Cleanup
sql/sql_cache.cc:
  Back to using semaphores
sql/sql_cache.h:
  Back to using semaphores
sql/sql_insert.cc:
  Cleanup TIMESPEC usage
sql/sql_manager.cc:
  Cleanup TIMESPEC usage
sql/sql_parse.cc:
  Cleanup
sql/sql_repl.cc:
  Cleanup TIMESPEC usage
sql/sql_show.cc:
  Added 'Null' and 'Index_type' to SHOW INDEX.
sql/sql_table.cc:
  Sort keys in table in a more logical order.
sql/sql_yacc.yy:
  Support for SIGNED/UNSIGNED casts.
2002-01-02 21:29:41 +02:00
unknown
c7552758bc row0mysql.c:
Remove erroneous warning of a duplicate key when the key in a UNIQUE secondary index contains a NULL


innobase/row/row0mysql.c:
  Remove erroneous warning of a duplicate key when the key in a UNIQUE secondary index contains a NULL
2001-12-31 14:41:58 +02:00
unknown
62b5dbf9fd btr0sea.c:
Eliminate a gcc compiler bug in inlining


innobase/btr/btr0sea.c:
  Eliminate a gcc compiler bug in inlining
2001-12-27 18:43:49 +02:00
unknown
cb25ddd100 os0file.c:
Make os_file_flush to ignore the error we get from a raw device in fsync


innobase/os/os0file.c:
  Make os_file_flush to ignore the error we get from a raw device in fsync
2001-12-27 00:56:40 +02:00
unknown
42c224c388 log0recv.c:
Print progress info of the applying log records to the database phase in recovery
srv0srv.c:
  Do buffer pool flush and checkpoints more often to make recovery faster


innobase/srv/srv0srv.c:
  Do buffer pool flush and checkpoints more often to make recovery faster
innobase/log/log0recv.c:
  Print progress info of the applying log records to the database phase in recovery
2001-12-24 22:27:11 +02:00
unknown
5a75207c12 data0type.ic, rem0cmp.c:
Allow foreign keys refer between fixed and var length strings


innobase/rem/rem0cmp.c:
  Allow foreign keys refer between fixed and var length strings
innobase/include/data0type.ic:
  Allow foreign keys refer between fixed and var length strings
2001-12-22 21:08:25 +02:00
unknown
22da9e12f8 Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
mysql-test/mysql-test-run.sh:
  Auto merged
2001-12-21 07:44:06 +02:00
unknown
5478a2adb7 merge with 3.23.47
Docs/manual.texi:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/mysqld.cc:
  Use local version.
2001-12-21 07:03:03 +02:00
unknown
9d9e0a08d7 row0ins.c:
Allow equal key values in a unique secondary index if the key value contains an SQL NULL


innobase/row/row0ins.c:
  Allow equal key values in a unique secondary index if the key value contains an SQL NULL
2001-12-20 22:45:07 +02:00
unknown
a1b810cc4a log0recv.c:
Add warnings to recovery in some cases where log file might be corrupt and consequently recovery can be trusted less than normally


innobase/log/log0recv.c:
  Add warnings to recovery in some cases where log file might be corrupt and consequently recovery can be trusted less than normally
2001-12-20 20:00:39 +02:00
unknown
a6de7403cd Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 2001-12-17 23:35:15 +02:00
unknown
11cbe4271c merge with 3.23.47 (DO statement)
innobase/dict/dict0dict.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/Makefile.am:
  merge
sql/mysql_priv.h:
  merge
sql/sql_lex.h:
  merge
sql/sql_yacc.yy:
  merge
2001-12-17 20:47:20 +02:00
unknown
d7bd586873 ha_innobase.cc, dict0dict.c:
Cleanup


innobase/dict/dict0dict.c:
  Cleanup
sql/ha_innobase.cc:
  Cleanup
2001-12-17 13:32:22 +02:00
unknown
b41e57a70e dict0mem.c, dict0dict.c, row0mysql.c, dict0mem.h:
Do less statistics calculations for tables
dict0mem.h, row0mysql.c:
  Make calculation of new statistics less frequent, because the statistics in 3.23.44 involves many random disk reads


innobase/include/dict0mem.h:
  Do less statistics calculations for tables
innobase/row/row0mysql.c:
  Do less statistics calculations for tables
innobase/dict/dict0dict.c:
  Do less statistics calculations for tables
innobase/dict/dict0mem.c:
  Do less statistics calculations for tables
2001-12-17 13:17:48 +02:00
unknown
70b5fe5f9a Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
mysql-test/mysql-test-run.sh:
  Auto merged
2001-12-17 03:14:59 +02:00
unknown
8f05035c27 Lots of portability fixes.
Fixed shutdown on HPUX.
Fixed bug in query cache.


Docs/manual.texi:
  Changelog
configure.in:
  Fixes for HPUX
include/m_string.h:
  Fixes for Purify
include/my_pthread.h:
  Fixes for HPUX
include/raid.h:
  Portability fix.
innobase/include/univ.i:
  Portability fix.
mysql-test/mysql-test-run.sh:
  Added --manual-gdb
mysql-test/r/rpl_log.result:
  Portability fix
mysql-test/t/rpl_log.test:
  Portability fix
mysys/my_pthread.c:
  Portability fix (HPUX)
mysys/raid.cc:
  Portability fix
mysys/thr_mutex.c:
  Portability fix
scripts/mysql_install_db.sh:
  Clean up install message
sql-bench/test-alter-table.sh:
  Fix testsuite
sql/ha_innobase.cc:
  Fixed stack overwrite.
sql/log_event.cc:
  Fixed purify warning
sql/mysqld.cc:
  Added patch from FreeBSD port.
  Fixed shutdown on HPUX.
sql/slave.cc:
  Cleanup
sql/sql_cache.cc:
  Binary search in 'step' searching
  Check maximal block in bin
  Limit of comparasions number in list of memory blocks.
  Fixed bug in pack()
sql/sql_cache.h:
  Binary search in 'step' searching
  Check maximal block in bin
  Limit of comparasions number in list of memory blocks.
  Fixed bug in pack()
sql/sql_parse.cc:
  Optimize
tools/mysqlmanager.c:
  Portability fix
2001-12-17 03:02:58 +02:00
unknown
63e4dec244 Merge with 3.23.47
extra/resolve_stack_dump.c:
  Auto merged
include/my_bitmap.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
mysql-test/t/rpl_get_lock.test:
  Auto merged
2001-12-15 05:12:21 +02:00
unknown
85a8f75a7d dict0crea.c:
Add diagnostic code to find out why foreign key constraint creation sometimes fails


innobase/dict/dict0crea.c:
  Add diagnostic code to find out why foreign key constraint creation sometimes fails
2001-12-14 19:35:31 +02:00
unknown
8e6ac521eb rem0rec.ic:
Remove a theoretical overrun in adaptive hash index building


innobase/include/rem0rec.ic:
  Remove a theoretical overrun in adaptive hash index building
2001-12-14 19:15:57 +02:00
unknown
0de5d9930f buf0buf.c:
Eliminate a Purify warning in a multithreaded test: the fields are not protected by a mutex, therefore they can be read uninitialized


innobase/buf/buf0buf.c:
  Eliminate a Purify warning in a multithreaded test: the fields are not protected by a mutex, therefore they can be read uninitialized
2001-12-14 18:50:43 +02:00
unknown
5aabe241ab Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 2001-12-13 22:16:06 +02:00
unknown
6e31c2ca7d merge
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
Docs/manual.texi:
  Merge
2001-12-13 20:54:20 +02:00
unknown
0f858c2d1d Merge
mysql-test/mysql-test-run.sh:
  SCCS merged
2001-12-13 03:41:54 +02:00
unknown
b9562004e9 sync0arr.c:
Increase semaphore wait warning threshold to 240 seconds


innobase/sync/sync0arr.c:
  Increase semaphore wait warning threshold to 240 seconds
2001-12-11 23:45:49 +02:00
unknown
75125cf0e7 btr0cur.c:
Improve table cardinality estimate if there are big BLOBs


innobase/btr/btr0cur.c:
  Improve table cardinality estimate if there are big BLOBs
2001-12-11 23:42:31 +02:00
unknown
a2675d2916 ut0byte.h, ut0byte.c, dict0dict.c:
Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows


innobase/dict/dict0dict.c:
  Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
innobase/ut/ut0byte.c:
  Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
innobase/include/ut0byte.h:
  Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
2001-12-11 22:45:32 +02:00
unknown
72ec7dfc65 Fix for MyISAM records > 16M
Docs/manual.texi:
  ChangeLog
innobase/os/os0file.c:
  Removed compiler warnings
myisam/mi_check.c:
  Fix for records > 16M
myisam/mi_dynrec.c:
  Fix for records > 16M
myisam/myisamdef.h:
  Fix for records > 16M
sql/sql_select.cc:
  Cleanup
sql/sql_yacc.yy:
  F
2001-12-11 20:45:48 +02:00
unknown
72bd4cd4fb Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 2001-12-06 02:38:50 +02:00
unknown
b5cfb7ac01 merge with 3.23.47
Docs/manual.texi:
  Auto merged
Build-tools/Do-compile:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/handler.h:
  Auto merged
configure.in:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join_outer.result:
  merge
mysql-test/r/myisam.result:
  merge
mysql-test/t/innodb.test:
  merge
mysys/mf_iocache2.c:
  Skip changes in 3.23
sql/sql_select.cc:
  merge
2001-12-06 01:16:28 +02:00
unknown
bc26e18dc5 buf0buf.ic, mtr0log.ic:
Add diagnostic code to catch possible space id or page no errors in the log


innobase/include/mtr0log.ic:
  Add diagnostic code to catch possible space id or page no errors in the log
innobase/include/buf0buf.ic:
  Add diagnostic code to catch possible space id or page no errors in the log
2001-12-04 17:03:24 +02:00
unknown
d12413f6f6 log0recv.c:
Add fault tolerance: when a log record contains nonsensical space id or page number, stop log scan there


innobase/log/log0recv.c:
  Add fault tolerance: when a log record contains nonsensical space id or page number, stop log scan there
2001-12-04 16:01:30 +02:00
unknown
daed6ff07f Removed purify warning
Remove temporary files before starting mysql-test


innobase/pars/pars0opt.c:
  Removed purify warning
mysql-test/mysql-test-run.sh:
  remove temporary files before starting
2001-11-30 00:48:26 +02:00
unknown
e673b6dcf8 merge
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2001-11-22 14:40:38 +02:00
unknown
689a55b1ad srv0srv.c:
Fix a seg fault if a lock wait timeout is exceeded at the some time someone grants the lock


innobase/srv/srv0srv.c:
  Fix a seg fault if a lock wait timeout is exceeded at the some time someone grants the lock
2001-11-19 13:11:37 +02:00
unknown
b87029d80c Merge
Docs/manual.texi:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2001-11-18 14:33:53 +02:00