diff options
| author | unknown <konstantin@mysql.com> | 2005-05-14 12:38:12 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-05-14 12:38:12 +0400 |
| commit | 7f5bf3dcdb436d08d8a8ed62c7683e27f6e85cc4 (patch) | |
| tree | 301d852032306dc5560a6076b889c4d7c3d6da7d /sql | |
| parent | 18fd0b9467f30a40de83ab54dcffdfd180d83338 (diff) | |
| parent | ba3540cc6991c49e0f43501e600018896b5e0dcb (diff) | |
| download | mariadb-git-7f5bf3dcdb436d08d8a8ed62c7683e27f6e85cc4.tar.gz | |
Manual merge (again)
configure.in:
Auto merged
include/mysql.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ps_grant.test:
Auto merged
sql/ha_blackhole.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
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 c5062c4ea81..dcc542a7247 100644 --- a/sql/ha_blackhole.cc +++ b/sql/ha_blackhole.cc @@ -132,8 +132,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 bda5700b273..6439bc8a2d7 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3307,7 +3307,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, 0) { my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), - name->c_ptr(), table->s->table_name); + name->c_ptr_safe(), table->s->table_name); map->set_all(); return 1; } |