mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 23:25:34 +02:00
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
This commit is contained in:
parent
83fc12f216
commit
a355b6ac70
13 changed files with 85 additions and 56 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue