summaryrefslogtreecommitdiff
path: root/sql/ha_isam.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-09-19 17:49:41 +0300
committermonty@mashka.mysql.fi <>2002-09-19 17:49:41 +0300
commitce4b584a8526fe8470cfc2187cd7b30e2b6a8a54 (patch)
tree897900b716e0af342d6a5a9d3c9f2bc23261dc72 /sql/ha_isam.cc
parentf638ee6df91a32ed767fa67cf643dfa07f9a82d4 (diff)
downloadmariadb-git-ce4b584a8526fe8470cfc2187cd7b30e2b6a8a54.tar.gz
Increased max possible max_allowed_packet to 1G
Small optimization to not do external locking of temporary MyISAM tables.
Diffstat (limited to 'sql/ha_isam.cc')
-rw-r--r--sql/ha_isam.cc4
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;
}