diff options
| author | unknown <ndbdev@dl145c.mysql.com> | 2005-09-15 07:36:47 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145c.mysql.com> | 2005-09-15 07:36:47 +0200 |
| commit | b763c011b04b7a33113b91091ac65c9f8c77a011 (patch) | |
| tree | 23b82d6dda69edf445b72fe960239c2e3eb5b50b /sql/sql_handler.cc | |
| parent | 9a7ec9517c8b371d39ac65b74aa00f180f8c17d0 (diff) | |
| parent | b34d5bd24733e2e50d4d32c37fa9ebc722177bf2 (diff) | |
| download | mariadb-git-b763c011b04b7a33113b91091ac65c9f8c77a011.tar.gz | |
merge
sql/ha_federated.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index fc7d7ac0012..5f065e2a8b8 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -346,6 +346,7 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, uint num_rows; byte *key; uint key_len; + bool not_used; DBUG_ENTER("mysql_ha_read"); DBUG_PRINT("enter",("'%s'.'%s' as '%s'", tables->db, tables->table_name, tables->alias)); @@ -431,7 +432,7 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, protocol->send_fields(&list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF); HANDLER_TABLES_HACK(thd); - lock= mysql_lock_tables(thd, &tables->table, 1, 0); + lock= mysql_lock_tables(thd, &tables->table, 1, 0, ¬_used); HANDLER_TABLES_HACK(thd); if (!lock) |