diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-12 17:41:05 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-12 17:41:05 -0400 |
| commit | 6b2d502a117351fc1c1024e440ba672586f8832e (patch) | |
| tree | a0b9a43a413eac584552b1ca4165f411c350eb3f /sql/sql_base.cc | |
| parent | 1265506376a1a630517fbb3ccb25d020fc6aa81d (diff) | |
| parent | 3166382d054656463cabae57b87e68b33f6c79c8 (diff) | |
| download | mariadb-git-6b2d502a117351fc1c1024e440ba672586f8832e.tar.gz | |
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
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 2298de7eeb5..9b7d46119b7 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2686,7 +2686,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; |