1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.1 to mysql-5.5.

Browse Source
This commit is contained in:
Annamalai Gurusami 2012-05-16 14:10:18 +05:30
commit 0de21532cb
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sql/handler.cc
View File

@ -2528,6 +2528,17 @@ int handler::update_auto_increment()
reservation means potentially losing unused values). reservation means potentially losing unused values).
Note that in prelocked mode no estimation is given. Note that in prelocked mode no estimation is given.
*/ */
/*
For multi-row inserts, if the bulk inserts cannot be started, the
handler::estimation_rows_to_insert will not be set. Set it here.
*/
if ((estimation_rows_to_insert == 0) &&
(thd->lex->many_values.elements > 0))
{
estimation_rows_to_insert= thd->lex->many_values.elements;
}
if ((auto_inc_intervals_count == 0) && (estimation_rows_to_insert > 0)) if ((auto_inc_intervals_count == 0) && (estimation_rows_to_insert > 0))
nb_desired_values= estimation_rows_to_insert; nb_desired_values= estimation_rows_to_insert;
else /* go with the increasing defaults */ else /* go with the increasing defaults */
@ -5121,6 +5132,8 @@ int handler::ha_write_row(uchar *buf)
if (unlikely(error= binlog_log_row(table, 0, buf, log_func))) if (unlikely(error= binlog_log_row(table, 0, buf, log_func)))
DBUG_RETURN(error); /* purecov: inspected */ DBUG_RETURN(error); /* purecov: inspected */
DEBUG_SYNC_C("ha_write_row_end");
DBUG_RETURN(0); DBUG_RETURN(0);
} }