Commit 77e01ec9 authored by marko's avatar marko

branches/zip: innobase_check_index_keys(): return 0 instead of DB_SUCCESS,

as documented.  Do not translate the error code.

This function is still broken; we should probably use my_error() for
reporting errors.
parent b532e505
...@@ -7907,7 +7907,7 @@ innobase_check_index_keys( ...@@ -7907,7 +7907,7 @@ innobase_check_index_keys(
{ {
Field* field; Field* field;
ulint key_num; ulint key_num;
int error = DB_SUCCESS; int error = 0;
ibool is_unsigned; ibool is_unsigned;
ut_ad(table && innodb_table && trx && key_info && num_of_keys); ut_ad(table && innodb_table && trx && key_info && num_of_keys);
...@@ -8341,11 +8341,11 @@ ha_innobase::add_index( ...@@ -8341,11 +8341,11 @@ ha_innobase::add_index(
error = innobase_check_index_keys( error = innobase_check_index_keys(
table, innodb_table, trx, key_info, num_of_keys); table, innodb_table, trx, key_info, num_of_keys);
if (UNIV_UNLIKELY(error != DB_SUCCESS)) { if (UNIV_UNLIKELY(error)) {
err_exit: err_exit:
mem_heap_free(heap); mem_heap_free(heap);
trx_general_rollback_for_mysql(trx, FALSE, NULL); trx_general_rollback_for_mysql(trx, FALSE, NULL);
DBUG_RETURN(convert_error_code_to_mysql(error, user_thd)); DBUG_RETURN(error);
} }
/* Create table containing all indexes to be built in this /* Create table containing all indexes to be built in this
......
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