maria-developers team mailing list archive
-
maria-developers team
-
Mailing list archive
-
Message #07592
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.
Logging: ./mtr --mem --reorder --force --max-test-fail=0 --parallel=4 --suite=connect
vardir: /dev/shm/var_auto_efG0
Checking leftover processes...
Removing old var directory...
Creating var directory '/dev/shm/var_auto_efG0'...
Checking supported features...
MariaDB Version 10.0.13-MariaDB-debug
- SSL connections supported
- binaries are debug compiled
Using suites: connect
Collecting tests...
Installing system database...
==============================================================================
TEST WORKER RESULT TIME (ms) or COMMENT
--------------------------------------------------------------------------
worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 16000..16019
worker[2] Using MTR_BUILD_THREAD 301, with reserved ports 16020..16039
worker[3] Using MTR_BUILD_THREAD 302, with reserved ports 16040..16059
worker[4] Using MTR_BUILD_THREAD 303, with reserved ports 16060..16079
connect.part_file w1 [ fail ]
Test ended at 2014-07-29 10:34:35
CURRENT_TEST: connect.part_file
mysqltest: At line 143: query 'ALTER TABLE t1 ADD PRIMARY KEY (id)' failed: 1845: Alter operations not supported together by CONNECT
The result from queries just before the failure was:
< snip >
SELECT * FROM dr1 ORDER BY fname, ftype;
fname ftype
part1 .fnx
part1 .txt
part2 .fnx
part2 .txt
part3 .fnx
part3 .txt
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE id = 10;
id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 1 ref XID XID 4 const 1
DROP INDEX XID ON t1;
SHOW INDEX FROM t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
SELECT * FROM dr1 ORDER BY fname, ftype;
fname ftype
part1 .txt
part2 .txt
part3 .txt
ALTER TABLE t1 ADD PRIMARY KEY (id);
More results from queries before failure can be found in /dev/shm/var_auto_efG0/1/log/part_file.log
- saving '/dev/shm/var_auto_efG0/1/log/connect.part_file/' to '/dev/shm/var_auto_efG0/log/connect.part_file/'
connect.secure_file_priv w3 [ pass ] 94
connect.part_table w2 [ pass ] 707
connect.alter w4 [ pass ] 941
connect.alter_xml w1 [ pass ] 213
connect.odbc_xls w4 [ skipped ] Need ODBC data source ConnectEngineXLS
connect.ini_grant w3 [ pass ] 324
connect.mul w3 [ pass ] 16
connect.pivot w4 [ pass ] 118
connect.occur w2 [ pass ] 287
connect.bin w1 [ pass ] 658
connect.tbl w4 [ pass ] 82
connect.mysql w3 [ fail ]
Test ended at 2014-07-29 10:34:37
CURRENT_TEST: connect.mysql
--- /home/bar/maria-bzr/maria-10.0.connect-merge/storage/connect/mysql-test/connect/r/mysql.result 2014-07-29 08:43:32.252505000 +0400
+++ /home/bar/maria-bzr/maria-10.0.connect-merge/storage/connect/mysql-test/connect/r/mysql.reject 2014-07-29 10:34:37.155353995 +0400
@@ -282,8 +282,6 @@
20
30
ALTER TABLE t2 MODIFY a TINYINT;
-Warnings:
-Warning 1105 This is an outward table, table data were not modified.
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
mysqltest: Result length mismatch
- saving '/dev/shm/var_auto_efG0/3/log/connect.mysql/' to '/dev/shm/var_auto_efG0/log/connect.mysql/'
connect.odbc w2 [ pass ] 31
connect.odbc_oracle w2 [ skipped ] Need ODBC data source ConnectEngineOracle
connect.odbc_postgresql w2 [ skipped ] Need ODBC data source ConnectEnginePostgresql
connect.unsigned w4 [ pass ] 71
connect.mysql_discovery w3 [ pass ] 67
connect.upd w4 [ pass ] 214
connect.odbc_sqlite3 w2 [ pass ] 455
connect.vec w4 [ pass ] 26
connect.mysql_exec w3 [ pass ] 237
connect.xcol w4 [ pass ] 20
connect.csv w1 [ pass ] 1813
connect.odbc_sqlite3_grant w2 [ pass ] 474
connect.xml w4 [ pass ] 70
connect.mysql_grant w3 [ pass ] 548
connect.xml_mult w2 [ pass ] 48
connect.dbf w1 [ pass ] 357
connect.mysql_new w3 [ pass ] 160
connect.dir w2 [ pass ] 19
connect.xml_grant w4 [ pass ] 513
connect.fix w1 [ pass ] 31
connect.null w3 [ pass ] 42
connect.fmt w2 [ pass ] 30
connect.xml_mdev5261 w4 [ pass ] 14
connect.general w1 [ pass ] 6
connect.ini w4 [ pass ] 41
connect.index w2 [ pass ] 307
connect.grant w3 [ pass ] 567
--------------------------------------------------------------------------
The servers were restarted 4 times
Spent 9.601 of 11 seconds executing testcases
Completed: Failed 2/37 tests, 94.59% were successful.
Failing test(s): connect.part_file connect.mysql
The log files in var/log may give you some hint of what went wrong.
If you want to report this error, please read first the documentation
at http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html
3 tests were skipped, 3 by the test itself.
