diff options
author | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 13:16:17 +0200 |
commit | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (patch) | |
tree | 9e2bc4700a2db961d967e53f00c941f3ee501173 /sql/lock.cc | |
parent | cfa0c6ff1d8f7268f895d79daf94e7d29197327d (diff) | |
parent | ff3da0f963b28d128005da8ca5d0c93a72d34b27 (diff) | |
download | mariadb-git-869f5d0e81d5cbecaec3605f292fbb363b9ccbf6.tar.gz |
Merge with alias as String
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 e5ea85e7ce7..8f5b5ac233f 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -901,7 +901,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, *write_lock_used=table; if (table->db_stat & HA_READ_ONLY) { - my_error(ER_OPEN_AS_READONLY,MYF(0),table->alias); + my_error(ER_OPEN_AS_READONLY,MYF(0),table->alias.c_ptr()); /* Clear the lock type of the lock data that are stored already. */ sql_lock->lock_count= (uint) (locks - sql_lock->locks); reset_lock_data(sql_lock); |