database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

Browse Source 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
This commit is contained in:
lars/lthalmann@dl145j.mysql.com
2007-03-31 00:17:12 +02:00
parent b8e0d3490e 5533e6e533
commit f6f848b9e7
181 changed files with 5812 additions and 3888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_base.cc
View File

@ -1394,10 +1394,10 @@ void close_temporary_tables(THD *thd)
due to special characters in the names
*/
append_identifier(thd, &s_query, table->s->db.str, strlen(table->s->db.str));
s_query.q_append('.');
s_query.append('.');
append_identifier(thd, &s_query, table->s->table_name.str,
strlen(table->s->table_name.str));
s_query.q_append(',');
s_query.append(',');
next= table->next;
close_temporary(table, 1, 1);
}
@ -3812,7 +3812,7 @@ TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
tmp_table->reginfo.lock_type= TL_WRITE; // Simulate locked
share->tmp_table= (tmp_table->file->has_transactions() ?
TRANSACTIONAL_TMP_TABLE : TMP_TABLE);
TRANSACTIONAL_TMP_TABLE : NON_TRANSACTIONAL_TMP_TABLE);
if (link_in_list)
{