diff options
| author | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-05-27 17:38:04 -0400 |
|---|---|---|
| committer | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-05-27 17:38:04 -0400 |
| commit | 5fecbb448e7f122030127604177531d806bccda5 (patch) | |
| tree | 02dc89d25a46a6f527748a7c6e49c7a29bf7a5a4 /sql/sql_base.cc | |
| parent | e05d55de5ff6c95143fb1096da8019ab5fb7c6a2 (diff) | |
| parent | a29e59e00c772f08995d74978a7ded2e8d05c3e9 (diff) | |
| download | mariadb-git-5fecbb448e7f122030127604177531d806bccda5.tar.gz | |
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
mysql-test/r/partition.result:
manual merge
mysql-test/t/partition.test:
manual merge
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 58c04224ac9..c39cb91198e 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2684,7 +2684,7 @@ retry: goto err; // Code below is for repairing a crashed file - if ((error= lock_table_name(thd, table_list))) + if ((error= lock_table_name(thd, table_list, TRUE))) { if (error < 0) goto err; |