mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with MariaDB 5.1

Browse source
This commit is contained in:
Michael Widenius 2011-05-03 19:10:10 +03:00
commit 1be5462d59
607 changed files with 10981 additions and 4283 deletions
Download patch file Download diff file Expand all files Collapse all files

21
storage/xtradb/handler/i_s.cc
View file

@ -3969,6 +3969,14 @@ static ST_FIELD_INFO i_s_innodb_sys_stats_info[] =
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
{STRUCT_FLD(field_name, "NON_NULL_VALS"),
STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS),
STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG),
STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED | MY_I_S_MAYBE_NULL),
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
END_OF_ST_FIELD_INFO
};
@ -4237,6 +4245,9 @@ copy_sys_stats_rec(
{
int status;
int field;
ulint n_fields;
n_fields = rec_get_n_fields_old(rec);
/* INDEX_ID */
field = dict_index_get_nth_col_pos(index, 0);
@ -4256,6 +4267,16 @@ copy_sys_stats_rec(
if (status) {
return status;
}
/* NON_NULL_VALS */
if (n_fields < 6) {
table->field[3]->set_null();
} else {
field = dict_index_get_nth_col_pos(index, 3);
status = copy_id_field(table, 3, rec, field);
if (status) {
return status;
}
}
return 0;
}