Commit a9c23066 authored by Marko Mäkelä's avatar Marko Mäkelä

Fix -Wmaybe-uninitialized (non-functional change)

parent 2b00bdfd
...@@ -9041,7 +9041,6 @@ innobase_rename_or_enlarge_column_try( ...@@ -9041,7 +9041,6 @@ innobase_rename_or_enlarge_column_try(
bool is_v) bool is_v)
{ {
dict_col_t* col; dict_col_t* col;
dict_v_col_t* v_col;
DBUG_ENTER("innobase_rename_or_enlarge_column_try"); DBUG_ENTER("innobase_rename_or_enlarge_column_try");
...@@ -9050,12 +9049,16 @@ innobase_rename_or_enlarge_column_try( ...@@ -9050,12 +9049,16 @@ innobase_rename_or_enlarge_column_try(
ut_ad(mutex_own(&dict_sys->mutex)); ut_ad(mutex_own(&dict_sys->mutex));
ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X)); ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X));
ulint n_base;
if (is_v) { if (is_v) {
v_col = dict_table_get_nth_v_col(user_table, pos); dict_v_col_t* v_col= dict_table_get_nth_v_col(user_table, pos);
pos = dict_create_v_col_pos(v_col->v_pos, v_col->m_col.ind); pos = dict_create_v_col_pos(v_col->v_pos, v_col->m_col.ind);
col = &v_col->m_col; col = &v_col->m_col;
n_base = v_col->num_base;
} else { } else {
col = dict_table_get_nth_col(user_table, pos); col = dict_table_get_nth_col(user_table, pos);
n_base = 0;
} }
ulint prtype, mtype, len; ulint prtype, mtype, len;
...@@ -9107,8 +9110,7 @@ innobase_rename_or_enlarge_column_try( ...@@ -9107,8 +9110,7 @@ innobase_rename_or_enlarge_column_try(
DBUG_RETURN(innodb_insert_sys_columns(user_table->id, pos, DBUG_RETURN(innodb_insert_sys_columns(user_table->id, pos,
f.field_name.str, f.field_name.str,
mtype, prtype, len, mtype, prtype, len,
is_v ? v_col->num_base : 0, n_base, trx, true));
trx, true));
} }
/** Rename or enlarge columns in the data dictionary cache /** Rename or enlarge columns in the data dictionary cache
......
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