mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.
This commit is contained in:
@ -2077,6 +2077,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
|
||||
TABLE *copy;
|
||||
TABLE_SHARE *share;
|
||||
uchar *bitmap;
|
||||
char *copy_tmp;
|
||||
DBUG_ENTER("Delayed_insert::get_local_table");
|
||||
|
||||
/* First request insert thread to get a lock */
|
||||
@ -2109,14 +2110,15 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
|
||||
the other record buffers and alignment are unnecessary.
|
||||
*/
|
||||
thd_proc_info(client_thd, "allocating local table");
|
||||
copy= (TABLE*) client_thd->alloc(sizeof(*copy)+
|
||||
(share->fields+1)*sizeof(Field**)+
|
||||
share->reclength +
|
||||
share->column_bitmap_size*3);
|
||||
if (!copy)
|
||||
copy_tmp= (char*) client_thd->alloc(sizeof(*copy)+
|
||||
(share->fields+1)*sizeof(Field**)+
|
||||
share->reclength +
|
||||
share->column_bitmap_size*3);
|
||||
if (!copy_tmp)
|
||||
goto error;
|
||||
|
||||
/* Copy the TABLE object. */
|
||||
copy= new (copy_tmp) TABLE;
|
||||
*copy= *table;
|
||||
/* We don't need to change the file handler here */
|
||||
/* Assign the pointers for the field pointers array and the record. */
|
||||
@ -3505,7 +3507,7 @@ int select_create::write_to_binlog(bool is_trans, int errcode)
|
||||
Avoid to use thd->binlog_query() twice, otherwise it will print the unsafe
|
||||
warning twice.
|
||||
*/
|
||||
Query_log_event ev(thd, query.c_ptr_safe(), query.length(), is_trans,
|
||||
Query_log_event ev(thd, query.ptr(), query.length(), is_trans,
|
||||
FALSE, errcode);
|
||||
return mysql_bin_log.write(&ev);
|
||||
}
|
||||
|
Reference in New Issue
Block a user