diff options
| author | monty@donna.mysql.fi <> | 2001-04-25 22:44:27 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-04-25 22:44:27 +0300 |
| commit | 21e7c668ff8bea797ede22c3ce03f6f186685c35 (patch) | |
| tree | 681105409812886e617023277721945b0d24d385 /sql/sql_base.cc | |
| parent | 97c39276795e5734b0666f4219ab97364302574a (diff) | |
| download | mariadb-git-21e7c668ff8bea797ede22c3ce03f6f186685c35.tar.gz | |
Portability fixes for Ia64 and Sgi compiler
DROP DATABASE in mysqladmin asks for confirmation (again)
Added examined_rows to slow query log
SHOW CREATE for TEMPORARY table
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 134449fd20a..afff01e9a16 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1508,8 +1508,9 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db, tmp_table->reginfo.lock_type=TL_WRITE; // Simulate locked tmp_table->tmp_table = 1; tmp_table->table_cache_key=(char*) (tmp_table+1); - tmp_table->key_length= (uint) (strmov(strmov(tmp_table->table_cache_key,db) - +1, table_name) + tmp_table->key_length= (uint) (strmov((tmp_table->real_name= + strmov(tmp_table->table_cache_key,db) + +1), table_name) - tmp_table->table_cache_key)+1; int4store(tmp_table->table_cache_key + tmp_table->key_length, thd->slave_proxy_id); |