diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
| commit | a4e7283a9254c09057c92ec20fc145c52bea1d51 (patch) | |
| tree | 6009880c2c51b3422d95a760220fb7a20ebdb3e0 /sql/lock.cc | |
| parent | c425bf421da9ffa55d3d568f70508fa12dd07aa0 (diff) | |
| parent | 55ab1ef6951428e0be31956e152537dec670e7df (diff) | |
| download | mariadb-git-a4e7283a9254c09057c92ec20fc145c52bea1d51.tar.gz | |
Merge from 5.0 trunk.
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index d0576202606..4927146d96b 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -703,7 +703,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, { my_error(ER_WRONG_LOCK_OF_SYSTEM_TABLE, MYF(0), table_ptr[i]->s->db, table_ptr[i]->s->table_name); - return 0; + DBUG_RETURN(0); } } |