diff options
| author | unknown <serg@serg.mylan> | 2005-05-13 21:43:26 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-13 21:43:26 +0200 |
| commit | c3f73a428193150df234881352875ca3383b9740 (patch) | |
| tree | 9e1bd4a5606cc3fbf098258ca30e28d3864cdbb8 /sql | |
| parent | cbbc4ff6a25accdd3e11a0e2719c2201d23a7b68 (diff) | |
| download | mariadb-git-c3f73a428193150df234881352875ca3383b9740.tar.gz | |
sql/ha_blackhole.cc
bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc
libmysqld/examples/mysql.cc linking problem
sql/ha_blackhole.cc:
bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc:
libmysqld/examples/mysql.cc linking problem
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_blackhole.cc | 3 | ||||
| -rw-r--r-- | sql/sql_base.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_blackhole.cc b/sql/ha_blackhole.cc index 7c6e7cb56b6..c9c94b3a9d7 100644 --- a/sql/ha_blackhole.cc +++ b/sql/ha_blackhole.cc @@ -129,8 +129,9 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type) { + if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK) + lock.type=lock_type; *to++= &lock; - return to; } diff --git a/sql/sql_base.cc b/sql/sql_base.cc index c580842ce06..e86362c857b 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2522,7 +2522,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, if ((pos= find_type(&table->keynames, name->ptr(), name->length(), 1)) <= 0) { - my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(), + my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr_safe(), table->real_name); map->set_all(); return 1; |