Commit 1c0b90c2 authored by Chad MILLER's avatar Chad MILLER

Merge from team tree.

parents fdd9ad2c 09241793
...@@ -3577,7 +3577,8 @@ ha_innobase::write_row( ...@@ -3577,7 +3577,8 @@ ha_innobase::write_row(
/* out: error code */ /* out: error code */
uchar* record) /* in: a row in MySQL format */ uchar* record) /* in: a row in MySQL format */
{ {
int error = 0; ulint error = 0;
int error_result= 0;
ibool auto_inc_used= FALSE; ibool auto_inc_used= FALSE;
ulint sql_command; ulint sql_command;
trx_t* trx = thd_to_trx(user_thd); trx_t* trx = thd_to_trx(user_thd);
...@@ -3693,6 +3694,7 @@ no_commit: ...@@ -3693,6 +3694,7 @@ no_commit:
} }
/* MySQL errors are passed straight back. */ /* MySQL errors are passed straight back. */
error_result = (int) error;
goto func_exit; goto func_exit;
} }
...@@ -3786,7 +3788,7 @@ set_max_autoinc: ...@@ -3786,7 +3788,7 @@ set_max_autoinc:
err = innobase_set_max_autoinc(auto_inc); err = innobase_set_max_autoinc(auto_inc);
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
error = (int) err; error = err;
} }
} }
break; break;
...@@ -3796,12 +3798,12 @@ set_max_autoinc: ...@@ -3796,12 +3798,12 @@ set_max_autoinc:
innodb_srv_conc_exit_innodb(prebuilt->trx); innodb_srv_conc_exit_innodb(prebuilt->trx);
report_error: report_error:
error = convert_error_code_to_mysql(error, user_thd); error_result = convert_error_code_to_mysql((int) error, user_thd);
func_exit: func_exit:
innobase_active_small(); innobase_active_small();
DBUG_RETURN(error); DBUG_RETURN(error_result);
} }
/************************************************************************** /**************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment