include ibdata1 in data_set_size function
Merge branch 'include_ibdata1_in_data_size'