diff options
| author | unknown <lenz@mysql.com> | 2005-06-01 12:24:00 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-01 12:24:00 +0200 |
| commit | a0affca7c9c1af6aa43f9b6d50ebff5916a0af2e (patch) | |
| tree | cfd7621de64dfbd34c3b16a0bb61a4c084b1b2c2 /sql/sql_base.cc | |
| parent | 970d3e1a82defc061ddb2bc9f584a9379f4dbebc (diff) | |
| parent | 10481cd0368cb2ae07efd0f05c65748c3046eff8 (diff) | |
| download | mariadb-git-a0affca7c9c1af6aa43f9b6d50ebff5916a0af2e.tar.gz | |
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index c580842ce06..98ea4e0adf3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1163,7 +1163,7 @@ bool reopen_tables(THD *thd,bool get_locks,bool in_refresh) MYSQL_LOCK *lock; /* We should always get these locks */ thd->some_tables_deleted=0; - if ((lock=mysql_lock_tables(thd,tables,(uint) (tables_ptr-tables)))) + if ((lock= mysql_lock_tables(thd, tables, (uint) (tables_ptr-tables), 0))) { thd->locked_tables=mysql_lock_merge(thd->locked_tables,lock); } @@ -1644,7 +1644,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type) { DBUG_ASSERT(thd->lock == 0); // You must lock everything at once if ((table->reginfo.lock_type= lock_type) != TL_UNLOCK) - if (!(thd->lock=mysql_lock_tables(thd,&table_list->table,1))) + if (! (thd->lock= mysql_lock_tables(thd, &table_list->table, 1, 0))) table= 0; } } @@ -1794,7 +1794,7 @@ int lock_tables(THD *thd, TABLE_LIST *tables, uint count) if (!table->derived) *(ptr++)= table->table; } - if (!(thd->lock=mysql_lock_tables(thd,start, (uint) (ptr - start)))) + if (! (thd->lock= mysql_lock_tables(thd, start, (uint) (ptr - start), 0))) return -1; /* purecov: inspected */ } else |