[Maria-developers] merge 10.0-connect -> 10.0
Hello Olivier, I tried to merge 10.0-connect into the main 10.0, but two mtr tests failed in the merged tree. Note, they don't fail in 10.0-connect, so I guess something have changed in the main tree which makes your latest changes in 10.0-connect incompatible. Please find the log attached. I have no idea how to fix the failures. Can I push the merge into 10.0-connect, so you can fix the problems? Also, I noticed that you changed the sources outside of the "/storage/connect" directory:
--- sql/sql_partition.cc 2014-03-26 21:25:38 +0000 +++ sql/sql_partition.cc 2014-07-29 04:44:43 +0000 @@ -3195,13 +3195,26 @@ uint32 get_partition_id_cols_list_for_en (list_index - 1)*num_columns, nparts, left_endpoint, include_endpoint))); - +#if 0 if (!left_endpoint) { /* Set the end after this list tuple if not already after the last. */ if (list_index < part_info->num_parts) list_index++; } +#else + if (!left_endpoint && list_index < part_info->num_list_values) + { + /* + Set the end after this list tuple if it is not already after the last + and it matches. + */ + int cmp = cmp_rec_and_tuple_prune(list_col_array + list_index*num_columns, + nparts, left_endpoint, include_endpoint); + if (cmp >= 0) + list_index++; + } +#endif
DBUG_RETURN(list_index); }
Can you please comment why do you need this change? Did you discuss this change with anyone? Thanks.
participants (1)
-
Alexander Barkov