diff options
| author | unknown <serg@sergbook.mysql.com> | 2005-01-07 14:27:07 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2005-01-07 14:27:07 +0200 |
| commit | e1073b1f04fc64f3299282b08c3353109469be6e (patch) | |
| tree | fe3f4cabedfe9b4096999043bbdedd9971734645 /sql | |
| parent | 9bb36aa37cb8158a36cbcd8b17cc72e005125c2e (diff) | |
| parent | 4290679b7520f749af7b5fcdac4dd00e748969f1 (diff) | |
| download | mariadb-git-e1073b1f04fc64f3299282b08c3353109469be6e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 405d95bf456..48855892567 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -715,8 +715,8 @@ bool rename_temporary_table(THD* thd, TABLE *table, const char *db, (uint) strlen(table_name)+6+4))) return 1; /* purecov: inspected */ share->key_length= (uint) - (strmov(((char*) share->table_name= strmov(share->table_cache_key= key, - db)+1), + (strmov((char*) (share->table_name= strmov(share->table_cache_key= key, + db)+1), table_name) - share->table_cache_key)+1; share->db= share->table_cache_key; int4store(key+share->key_length, thd->server_id); |