diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-02 14:10:04 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-02 14:10:04 +0300 |
| commit | a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0 (patch) | |
| tree | 52d813ba1e4f0b538b1f175a1d157d865cce8a22 /sql/sql_plugin.cc | |
| parent | 487bfd56d4386fe9abbd4beb80d759b0c5c95909 (diff) | |
| parent | 46aa4c2672e2d0b1727dde5b80bd5039adbf96f6 (diff) | |
| download | mariadb-git-a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0.tar.gz | |
Manual merge from mysql-next-mr.
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 0342f90b58e..b328de40c10 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -1762,12 +1762,13 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name) reap_plugins(); pthread_mutex_unlock(&LOCK_plugin); + uchar user_key[MAX_KEY_LENGTH]; table->use_all_columns(); table->field[0]->store(name->str, name->length, system_charset_info); - if (! table->file->index_read_idx_map(table->record[0], 0, - (uchar *)table->field[0]->ptr, - HA_WHOLE_KEY, - HA_READ_KEY_EXACT)) + key_copy(user_key, table->record[0], table->key_info, + table->key_info->key_length); + if (! table->file->index_read_idx_map(table->record[0], 0, user_key, + HA_WHOLE_KEY, HA_READ_KEY_EXACT)) { int error; /* |