diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-19 17:49:41 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-19 17:49:41 +0300 |
| commit | a355b6ac7040d0e9540c7d8396d0b1b315a7aa0d (patch) | |
| tree | 897900b716e0af342d6a5a9d3c9f2bc23261dc72 /sql/ha_isam.cc | |
| parent | 83fc12f21653f1e6fc12c61791f4e6f2dd87be96 (diff) | |
| download | mariadb-git-a355b6ac7040d0e9540c7d8396d0b1b315a7aa0d.tar.gz | |
Increased max possible max_allowed_packet to 1G
Small optimization to not do external locking of temporary MyISAM tables.
BitKeeper/deleted/.del-sslopt-usage.h~3ab77eeeaad1ba0a:
Delete: include/sslopt-usage.h
Docs/manual.texi:
Fixed wrong descrtion of IF()
Added information about automatic cast of integer to binary string
ChangeLog
client/mysqlbinlog.cc:
Portability fix
client/mysqldump.c:
Increased max possible max_allowed_packet to 1G
include/Makefile.am:
Removed sslopt-usage.h
Made sslopt-case.h global
include/my_sys.h:
Fixd protypes for my_strdup_with_length()
mysys/safemalloc.c:
Fixd some prototypes
sql/ha_isam.cc:
Don't do external locking on temporary tables
sql/ha_myisam.cc:
Don't do external locking on temporary tables
sql/lock.cc:
Added big description of how LOCK TABLES affects locking
sql/log_event.cc:
cleanup
sql/mysqld.cc:
Increased max possible max_allowed_packet to 1G
sql/sql_table.cc:
Fixed portability problem
Diffstat (limited to 'sql/ha_isam.cc')
| -rw-r--r-- | sql/ha_isam.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_isam.cc b/sql/ha_isam.cc index 55d24f5edb9..052e6a4b9ec 100644 --- a/sql/ha_isam.cc +++ b/sql/ha_isam.cc @@ -244,7 +244,9 @@ int ha_isam::reset(void) int ha_isam::external_lock(THD *thd, int lock_type) { - return nisam_lock_database(file,lock_type); + if (!table->tmp_table) + return nisam_lock_database(file,lock_type); + return 0; } |