- developers - lists.mariadb.org

Re: [Maria-developers] b4a223e3381: MDEV-10355 Weird error message upon CREATE TABLE with DEFAULT
by Sergei Golubchik 07 Apr '17

07 Apr '17

Hi, Jacob! On Mar 28, jacob.mathew(a)mariadb.com wrote: > revision-id: b4a223e338152c8764c980aeae59fb927eea1b0b (mariadb-10.2.4-98-gb4a223e3381) > parent(s): 3f7455c03008b2428fa9b364b1add4c36834ff71 > author: Jacob Mathew > committer: Jacob Mathew > timestamp: 2017-03-28 17:41:56 -0700 > message: > > MDEV-10355 Weird error message upon CREATE TABLE with DEFAULT > > Fixed handling of default values with cached temporal functions so that the > CREATE TABLE statement now succeeds. > Added clearing of cached function values to trigger function reevaluation > when updating default values and when updating virtual column values. > Fixed the error message. > Added quoting of date/time values in cases when this was omitted. > Added a test case. > Updated test result files that include date/time values that were > previously unquoted. > > diff --git a/mysql-test/r/func_default_between_temporal.result b/mysql-test/r/func_default_between_temporal.result > new file mode 100644 > index 00000000000..db9656f4d37 > --- /dev/null > +++ b/mysql-test/r/func_default_between_temporal.result > @@ -0,0 +1,15 @@ > +CREATE OR REPLACE TABLE t1 ( col INT DEFAULT ( 1 LIKE ( NOW() BETWEEN '2000-01-01' AND '2012-12-12' ) ) ); > +SHOW CREATE TABLE t1; > +Table Create Table > +t1 CREATE TABLE `t1` ( > + `col` int(11) DEFAULT (1 like (current_timestamp() between '2000-01-01 00:00:00' and '2012-12-12 00:00:00')) > +) ENGINE=MyISAM DEFAULT CHARSET=latin1 > +SET timestamp = UNIX_TIMESTAMP( '2004-04-04' ); > +INSERT INTO t1 VALUES( DEFAULT ); > +SET timestamp = DEFAULT; better use another constant here, don't rely on the current timestamp being between 2000 and 2012. I know, sounds crazy. But debian's reproducible builds (*) do everything with the system time seriously off. (*) https://wiki.debian.org/ReproducibleBuilds > +INSERT INTO t1 VALUES( DEFAULT ); > +SELECT * FROM t1; > +col > +1 > +0 > +DROP TABLE t1; > diff --git a/mysql-test/t/func_default_between_temporal.test b/mysql-test/t/func_default_between_temporal.test please, rename the test somehow or put it into default.test. "func_default" means it's about a DEFAULT() function, but your test is not. > new file mode 100644 > index 00000000000..6cbd5a342c6 > --- /dev/null > +++ b/mysql-test/t/func_default_between_temporal.test > @@ -0,0 +1,11 @@ Start the test with a header, like # # MDEV-10355 Weird error message upon CREATE TABLE with DEFAULT # > +CREATE OR REPLACE TABLE t1 ( col INT DEFAULT ( 1 LIKE ( NOW() BETWEEN '2000-01-01' AND '2012-12-12' ) ) ); > +SHOW CREATE TABLE t1; > + > +SET timestamp = UNIX_TIMESTAMP( '2004-04-04' ); > +INSERT INTO t1 VALUES( DEFAULT ); > +SET timestamp = DEFAULT; > +INSERT INTO t1 VALUES( DEFAULT ); > + > +SELECT * FROM t1; > + > +DROP TABLE t1; > diff --git a/sql/item.cc b/sql/item.cc > index c34d27fa63b..ee3e43b60ad 100644 > --- a/sql/item.cc > +++ b/sql/item.cc > @@ -616,8 +616,9 @@ void Item::print_value(String *str) > str->append("NULL"); > else > { > - switch (result_type()) { > + switch (cmp_type()) { > case STRING_RESULT: > + case TIME_RESULT: okay, that fixes quoting. good. > append_unescaped(str, ptr->ptr(), ptr->length()); > break; > case DECIMAL_RESULT: > @@ -9433,17 +9433,26 @@ void Item_cache::store(Item *item) > > void Item_cache::print(String *str, enum_query_type query_type) > { > - if (value_cached) > + if ( example && ( example->type() == FUNC_ITEM ) && // There is a cached function item > + ( query_type & QT_ITEM_IDENT_SKIP_TABLE_NAMES ) ) // Caller is show-create-table 1. better test for QT_ITEM_CACHE_WRAPPER_SKIP_DETAILS 2. Why the test for FUNC_ITEM? I don't see any logical reason why skipping of "<cache>" should only apply to functions. and please watch the spacing around parentheses, try to use the same coding style as the rest of the code > { > - print_value(str); > - return; > + // Instead of "cache" or the cached value, print the function name > + example->print( str, query_type ); > } > - str->append(STRING_WITH_LEN("<cache>(")); > - if (example) > - example->print(str, query_type); > else > - Item::print(str, query_type); > - str->append(')'); > + { > + if (value_cached) Indentation. please, try to use the same coding style as the rest of the code > + { > + print_value(str); > + return; > + } It's not very logical that the value is not printed if one doesn't want "<cache>". I think this method could be like this: ================================== void Item_cache::print(String *str, enum_query_type query_type) { if (value_cached && !(query_type & QT_NO_DATA_EXPANSION)) { print_value(str); return; } if (!(query_type & QT_ITEM_CACHE_WRAPPER_SKIP_DETAILS)) str->append(STRING_WITH_LEN("<cache>(")); if (example) example->print(str, query_type); else Item::print(str, query_type); if (!(query_type & QT_ITEM_CACHE_WRAPPER_SKIP_DETAILS)) str->append(')'); } ================================== That is, print the value unless QT_NO_DATA_EXPANSION is specified. Print "<cache>" unless QT_ITEM_CACHE_WRAPPER_SKIP_DETAILS is specified. And Virtual_column_info::print() should also specify QT_NO_DATA_EXPANSION. > + str->append(STRING_WITH_LEN("<cache>(")); > + if (example) > + example->print(str, query_type); > + else > + Item::print(str, query_type); > + str->append(')'); > + } > } > > /** > diff --git a/sql/item.h b/sql/item.h > index 67640ce5f4d..222f8580cb4 100644 > --- a/sql/item.h > +++ b/sql/item.h > @@ -1653,6 +1653,7 @@ class Item: public Value_source, > { > return mark_unsupported_function(full_name(), arg, VCOL_IMPOSSIBLE); > } > + virtual bool clear_cached_function_value(void *arg) { return 0; } > virtual bool check_field_expression_processor(void *arg) { return 0; } > virtual bool check_func_default_processor(void *arg) { return 0; } > /* > @@ -5450,8 +5451,21 @@ class Item_cache: public Item_basic_constant, > } > bool check_vcol_func_processor(void *arg) > { > + if ( example ) > + { > + return example->check_vcol_func_processor( arg ); whitespace around parentheses and indentation > + } > return mark_unsupported_function("cache", arg, VCOL_IMPOSSIBLE); > } > + bool clear_cached_function_value( void *arg ) > + { > + if ( example && example->type() == Item::FUNC_ITEM ) > + { > + // Clear the cached function value to trigger reevaluation > + clear(); > + } > + return false; > + } Why did you need a dedicated clear_cached_function_value() processor? There's Item::cleanup() that should be called from fix_session_vcol_expr(). Oh, okay, I see two issues here. First, item->cleanup() does not recurse into function arguments. That's my bug, I should've used something like - vcol->expr->cleanup(); + vcol->expr->walk(&Item::cleanup_excluding_fields_processor, 0, 0); It has to be fixed, it's a genuine bug. A test case could be create table t1 (n varchar(100), cu varchar(100) default current_user(), uc varchar(100) default concat(current_user())); create definer=foo@localhost view v1 as select * from t1; insert v1 (n) values ('v1'); select * from t1; This is a slightly modified test from default_session.test file. Second, it's incorrect for Item_cache to use simply example->check_vcol_func_processor(arg); because caching requires re-fixing, even if the underlying example item doesn't. So, this should be something like bool check_vcol_func_processor(void *arg) { if ( example ) { Item::vcol_func_processor_result *res= (Item::vcol_func_processor_result*)arg; example->check_vcol_func_processor(arg); if (res->errors & VCOL_NOT_STRICTLY_DETERMINISTIC) res->errors|= VCOL_SESSION_FUNC; return false; } return mark_unsupported_function("cache", arg, VCOL_IMPOSSIBLE); } this sets VCOL_SESSION_FUNC flag, which will require item to be re-fixed for every statement. But doesn't set it for true constants. With these two fixes Item_cache::cleanup() { clear(); } should works just fine. > /** > Check if saved item has a non-NULL value. > Will cache value of saved item if not already done. > diff --git a/sql/table.cc b/sql/table.cc > index 3a08d1e49ea..9ae035e41aa 100644 > --- a/sql/table.cc > +++ b/sql/table.cc > @@ -2802,9 +2802,9 @@ static bool fix_and_check_vcol_expr(THD *thd, TABLE *table, > > int error= func_expr->walk(&Item::check_vcol_func_processor, 0, &res); > if (error || (res.errors & VCOL_IMPOSSIBLE)) > - { // this can only happen if the frm was corrupted > + { this comment is still true, don't delete it. and there's no need to pass the type inside anymore. > my_error(ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(0), res.name, > - "???", "?????"); > + vcol_type_name((enum_vcol_info_type) vcol_type), vcol->name.str); > DBUG_RETURN(1); > } > vcol->flags= res.errors; > @@ -7374,6 +7374,10 @@ int TABLE::update_virtual_fields(handler *h, enum_vcol_update_mode update_mode) > > if (update) > { > + // Clear any cached function values in the virtual field expression > + // to trigger their reevaluation > + vcol_info->expr->walk( &Item::clear_cached_function_value, 0, 0 ); // Always returns 0 There's no need to do that for every update_virtual_fields(), that is, no need to do it for every row, only needs to be done once per statement. And fix_session_vcol_expr() will do it for you if you implement Item_cache::cleanup() and set VCOL_SESSION_FUNC and fix fix_session_vcol_expr() to cleanup recursively. > + > int field_error __attribute__((unused)) = 0; > /* Compute the actual value of the virtual fields */ > if (vcol_info->expr->save_in_field(vf, 0)) Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org

2 4

Re: [Maria-developers] b7aa15458db: MDEV-11117 CHECK constraint fails on intermediate step of ALTER
by Sergei Golubchik 06 Apr '17

06 Apr '17

Hi, Jacob! On Apr 03, jacob.mathew(a)mariadb.com wrote: > revision-id: b7aa15458db95149af4f473a90009844a16e9db8 (mariadb-10.2.4-103-gb7aa15458db) > parent(s): 3c422e60bbee79bb636e65910c26ac193de70a84 > author: Jacob Mathew > committer: Jacob Mathew > timestamp: 2017-04-03 17:54:32 -0700 > message: > > MDEV-11117 CHECK constraint fails on intermediate step of ALTER > > Fixed the bug by failing the statement with an error message that explains > that an auto-increment column may not be used in an expression for a > check constraint, a default value or a generated column. > Added a test case. > > new file mode 100644 > index 00000000000..e192fd16677 > --- /dev/null > +++ b/mysql-test/t/check_constraint_autoinc.test > @@ -0,0 +1,7 @@ > +# > +# An auto-increment column may not be used in an expression for > +# a check constraint: MDEV-11117 > +# > +--echo # AUTO_INCREMENT IN VCOL > +-- error ER_AUTOINC_IN_VIRTUAL_COLUMN_FUNCTION > +create or replace table t1( c1 int auto_increment primary key, check( c1 > 0 or c1 is null ) ); you could've added this 2-line test to the existing file check_constraint.test No strong arguments either way, though. Pro: mysqltest is executed for every test file, it's faster to have less test files. Don't know if the difference is big, though. Contra: it's easier to see what has failed with one test per file. It doesn't matter now, but might matter in the future, when we'll have more automatic failure analysys. > diff --git a/sql/field.h b/sql/field.h > index 50dcb397616..4bd43551648 100644 > --- a/sql/field.h > +++ b/sql/field.h > @@ -591,7 +591,8 @@ static inline const char *vcol_type_name(enum_vcol_info_type type) > #define VCOL_NON_DETERMINISTIC 2 > #define VCOL_SESSION_FUNC 4 /* uses session data, e.g. USER or DAYNAME */ > #define VCOL_TIME_FUNC 8 > -#define VCOL_IMPOSSIBLE 16 > +#define VCOL_AUTO_INC 16 > +#define VCOL_IMPOSSIBLE 32 > > #define VCOL_NOT_STRICTLY_DETERMINISTIC \ > (VCOL_NON_DETERMINISTIC | VCOL_TIME_FUNC | VCOL_SESSION_FUNC) > diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt > index 930cd2ceaa2..a78e97c2577 100644 > --- a/sql/share/errmsg-utf8.txt > +++ b/sql/share/errmsg-utf8.txt > @@ -7142,6 +7142,8 @@ ER_NO_EIS_FOR_FIELD > ER_WARN_AGGFUNC_DEPENDENCE > eng "Aggregate function '%-.192s)' of SELECT #%d belongs to SELECT #%d" > ukr "Агрегатна функція '%-.192s)' з SELECTу #%d належить до SELECTу #%d" > +ER_AUTOINC_IN_VIRTUAL_COLUMN_FUNCTION > + eng "Auto-increment column %`s may not be used in an expression for a check constraint, a default value or a generated column." First, please add error messages at the very end of the file. Second, there's an existing error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED eng "Function or expression '%s' cannot be used in the %s clause of %`s" which is generally used like my_error(ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(0), "NOW()", "CHECK", field->name); or, for subqueries my_error(ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(0), "SELECT ...", "DEFAULT", field->name); It'd be best if you could use it. If not, at least rephrase your error message to use ... in the %s clause of %`s pattern, instead of enumerating all possible places where autoincrement is not allowed. > diff --git a/sql/table.cc b/sql/table.cc > index 6b15c06cb91..d1772933190 100644 > --- a/sql/table.cc > +++ b/sql/table.cc > @@ -2811,6 +2811,19 @@ static bool fix_and_check_vcol_expr(THD *thd, TABLE *table, > "???", "?????"); > DBUG_RETURN(1); > } > + else if (res.errors & VCOL_AUTO_INC) > + { > + /* > + An auto_increment field may not be used in an expression for > + a check constraint, a default value or a generated column > + > + Note that this error condition is not detected during parsing > + of the statement because the field item does not have a field > + pointer at that time > + */ > + my_error(ER_AUTOINC_IN_VIRTUAL_COLUMN_FUNCTION, MYF(0), res.name); > + DBUG_RETURN(1); > + } > vcol->flags= res.errors; There is already a check for auto-increment in generated columns. I've added it in commit a418c9920047d5222a0d065343347312127b780f (see the change in item.cc). But the error message is somewhat confusing. And very confusing when applied to CHECK and DEFAULT. Yours is better, so please remove my check, no need to do it twice. Don't forget to re-run tests after that (at least vcol and gcol suites) as some error messages could change. Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org

1 0

[Maria-developers] mariadb-connector-c on mingw-w64 with pthreads
by Jeroen Ooms 06 Apr '17

06 Apr '17

For the language bindings for the R programming language (RMySQL) I am building mariadb-connector-c-2.3.2 on Windows using the mingw-w64 compiler. Our mingw-w64 compilers have been configured with pthreads support (same as msys2): - i686-493-posix-dwarf-rt_v3-s for win32 - x86_64-493-posix-seh-rt_v3-s for win64 Building libmariadbclient succeeds, however when I try to link the static library into the application I get these errors: C:/Rtools/mingw_64/lib/gcc/x86_64-w64-mingw32/lib/libpthread.a(libwinpthread_la-cond.o):cond.c:(.text+0x300): multiple definition of `pthread_cond_init' libmariadbclient.a(my_pthread.c.obj):my_pthread.c:(.text+0x0): first defined here Same error for 'pthread_cond_destroy', 'pthread_cond_wait', and 'pthread_cond_timedwait'. From the source code of my_pthread.c it seems that mariadb-connector-c is indeed redefining these functions on _WIN32. I guess this assumes MSVC which does not have native pthreads? Some questions: 1. What would be the correct way to configure/build mariadb-connector-c on mingw-w64 with native pthread support? 2. Is there a cmake option to disable threading alltogether? Thank you

2 1

[Maria-developers] Database corruption
by jerome brauge 05 Apr '17

05 Apr '17

Hello, We have a java tools to massively load data in a database (parallel load in different tables). With it, on bb-10.2-compatibility branch, I'm able to reproduce crash and sometimes database corruption: · on truncate (but delete works fine) · on parallel insert Crash seems occurred in innoDB code. See attached, logs of each case. Do you need more information ? Regards, Jérôme.

3 11

Re: [Maria-developers] JDBC getWarnings and stored procedure
by Daniel Black 05 Apr '17

05 Apr '17

On 03/04/17 20:21, jerome brauge wrote: > Hello, > > When we call a stored procedure in JDBC which emit warnings, > getWarnings() always returns null. > > I don’t really think that the problem is in MariaDB Connector J because > warning flag in the EOF packet is not set to true. > hasWarnings is set: https://github.com/MariaDB/mariadb-connector-j/blob/master/src/main/java/or… Its used here: https://github.com/MariaDB/mariadb-connector-j/blob/master/src/main/java/or… I suspect the bug is warningsCleared has a implicit default of false in the above class. As a workaround check, call reenableWarnings() before getWarnings(). > Mysql client behaves in the same way, by default it shows warnings count > issued by DML command but not for stored procedure. > > > > Is it a normal behavior ? > > > > Best regards, > > Jérôme. > > > > > > > > > > > > > > _______________________________________________ > Mailing list: https://launchpad.net/~maria-developers > Post to : maria-developers(a)lists.launchpad.net > Unsubscribe : https://launchpad.net/~maria-developers > More help : https://help.launchpad.net/ListHelp >

3 3

Re: [Maria-developers] [Commits] e446bf7: MDEV-12145: Wrong result (missing rows) on query with IN and EXISTS subqueries from InnoDB tables
by Igor Babaev 04 Apr '17

04 Apr '17

Varun, 1. The mdev # in the test case should be 12145 2. Could you please explain why do you need > @@ -9735,8 +9735,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) > !(used_tables & tab->emb_sj_nest->sj_inner_tables)) > { > save_used_tables= used_tables; > - used_tables= join->const_table_map | OUTER_REF_TABLE_BIT | > - RAND_TABLE_BIT; > + used_tables= join->const_table_map | RAND_TABLE_BIT; > } ? I checked your test case on 5.5 only with ; > */ > if (tab == join->join_tab + join->top_join_tab_count - 1) > - current_map|= OUTER_REF_TABLE_BIT | RAND_TABLE_BIT; > + current_map|= RAND_TABLE_BIT; > used_tables|=current_map; > > if (tab->type == JT_REF && tab->quick && and it passed. If the first change is really needed you have to produce a test case where it is really critical. If this is just cosmetic change the comment should clearly say about it. 3. I wonder why the patch is applied to 10.2 if it's reported for 5.5-10.2. Regards, Igor. On 04/04/2017 05:55 AM, Varun wrote: > revision-id: e446bf7dc49b96a09e11199ad3e05fade6490279 (mariadb-10.2.3-396-ge446bf7) > parent(s): 6d417a0bad205a6bacfee10dbc46dd631b093e75 > author: Varun Gupta > committer: Varun Gupta > timestamp: 2017-04-04 18:24:43 +0530 > message: > > MDEV-12145: Wrong result (missing rows) on query with IN and EXISTS subqueries from InnoDB tables > > Tables that are within SJ-Materialization nests cannot have their conditions referring to preceding non-const tables. But in this issue this was happening. > Fixed by not allowing used_tables to allow outer tables > > --- > mysql-test/r/subselect_sj2.result | 26 ++++++++++++++++++++++++++ > mysql-test/r/subselect_sj2_jcl6.result | 26 ++++++++++++++++++++++++++ > mysql-test/r/subselect_sj2_mat.result | 26 ++++++++++++++++++++++++++ > mysql-test/t/subselect_sj2.test | 24 ++++++++++++++++++++++++ > sql/sql_select.cc | 5 ++--- > 5 files changed, 104 insertions(+), 3 deletions(-) > > diff --git a/mysql-test/r/subselect_sj2.result b/mysql-test/r/subselect_sj2.result > index 948be57..14032ec 100644 > --- a/mysql-test/r/subselect_sj2.result > +++ b/mysql-test/r/subselect_sj2.result > @@ -1331,5 +1331,31 @@ WHERE a IN ( SELECT b FROM t2 LEFT JOIN v3 ON ( c = b ) ) ; > a pk b > DROP TABLE t1,t2,t3; > DROP VIEW v3; > +# > +# MDEV-11108: Assertion `uniq_tuple_length_arg <= table->file->max_key_length()' failed in SJ_TMP_TABLE::create_sj_weedout_tmp_table > +# > +CREATE TABLE t1 (f1 INT) ENGINE=InnoDB; > +INSERT INTO t1 VALUES (4),(6); > +CREATE TABLE t2 (i2 INT, KEY(i2)) ENGINE=InnoDB; > +INSERT INTO t2 VALUES (8),(7),(1); > +CREATE TABLE t3 (f3 INT, i3 INT, KEY(i3)) ENGINE=InnoDB; > +CREATE ALGORITHM=MERGE VIEW v3 AS SELECT * FROM t3; > +INSERT INTO t3 VALUES (8,0),(6,3),(2,8),(3,8),(1,6),(0,0),(1,0),(1,5); > +CREATE TABLE t4 (i4 INT, f4 INT, KEY(i4)) ENGINE=InnoDB; > +INSERT INTO t4 VALUES (0,0),(4,0),(0,2),(1,0),(2,1),(2,7),(6,3),(8,7),(8,1),(1,0),(7,2),(6,0),(8,1); > +SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2, t3 WHERE i3 = i2 AND f1 IN ( SELECT f3 FROM v3, t4 WHERE i4 = f3 AND f4 <> f3 ) ); > +f1 > +6 > +ANALYZE TABLE t1,t2,t3,t4; > +Table Op Msg_type Msg_text > +test.t1 analyze status OK > +test.t2 analyze status OK > +test.t3 analyze status OK > +test.t4 analyze status OK > +SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2, t3 WHERE i3 = i2 AND f1 IN ( SELECT f3 FROM v3, t4 WHERE i4 = f3 AND f4 <> f3 ) ); > +f1 > +6 > +DROP VIEW v3; > +DROP TABLE t1, t2, t3, t4; > # This must be the last in the file: > set optimizer_switch=@subselect_sj2_tmp; > diff --git a/mysql-test/r/subselect_sj2_jcl6.result b/mysql-test/r/subselect_sj2_jcl6.result > index 2955307..2aa0605 100644 > --- a/mysql-test/r/subselect_sj2_jcl6.result > +++ b/mysql-test/r/subselect_sj2_jcl6.result > @@ -1346,6 +1346,32 @@ WHERE a IN ( SELECT b FROM t2 LEFT JOIN v3 ON ( c = b ) ) ; > a pk b > DROP TABLE t1,t2,t3; > DROP VIEW v3; > +# > +# MDEV-11108: Assertion `uniq_tuple_length_arg <= table->file->max_key_length()' failed in SJ_TMP_TABLE::create_sj_weedout_tmp_table > +# > +CREATE TABLE t1 (f1 INT) ENGINE=InnoDB; > +INSERT INTO t1 VALUES (4),(6); > +CREATE TABLE t2 (i2 INT, KEY(i2)) ENGINE=InnoDB; > +INSERT INTO t2 VALUES (8),(7),(1); > +CREATE TABLE t3 (f3 INT, i3 INT, KEY(i3)) ENGINE=InnoDB; > +CREATE ALGORITHM=MERGE VIEW v3 AS SELECT * FROM t3; > +INSERT INTO t3 VALUES (8,0),(6,3),(2,8),(3,8),(1,6),(0,0),(1,0),(1,5); > +CREATE TABLE t4 (i4 INT, f4 INT, KEY(i4)) ENGINE=InnoDB; > +INSERT INTO t4 VALUES (0,0),(4,0),(0,2),(1,0),(2,1),(2,7),(6,3),(8,7),(8,1),(1,0),(7,2),(6,0),(8,1); > +SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2, t3 WHERE i3 = i2 AND f1 IN ( SELECT f3 FROM v3, t4 WHERE i4 = f3 AND f4 <> f3 ) ); > +f1 > +6 > +ANALYZE TABLE t1,t2,t3,t4; > +Table Op Msg_type Msg_text > +test.t1 analyze status OK > +test.t2 analyze status OK > +test.t3 analyze status OK > +test.t4 analyze status OK > +SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2, t3 WHERE i3 = i2 AND f1 IN ( SELECT f3 FROM v3, t4 WHERE i4 = f3 AND f4 <> f3 ) ); > +f1 > +6 > +DROP VIEW v3; > +DROP TABLE t1, t2, t3, t4; > # This must be the last in the file: > set optimizer_switch=@subselect_sj2_tmp; > # > diff --git a/mysql-test/r/subselect_sj2_mat.result b/mysql-test/r/subselect_sj2_mat.result > index a067422..1ea020a 100644 > --- a/mysql-test/r/subselect_sj2_mat.result > +++ b/mysql-test/r/subselect_sj2_mat.result > @@ -1333,6 +1333,32 @@ WHERE a IN ( SELECT b FROM t2 LEFT JOIN v3 ON ( c = b ) ) ; > a pk b > DROP TABLE t1,t2,t3; > DROP VIEW v3; > +# > +# MDEV-11108: Assertion `uniq_tuple_length_arg <= table->file->max_key_length()' failed in SJ_TMP_TABLE::create_sj_weedout_tmp_table > +# > +CREATE TABLE t1 (f1 INT) ENGINE=InnoDB; > +INSERT INTO t1 VALUES (4),(6); > +CREATE TABLE t2 (i2 INT, KEY(i2)) ENGINE=InnoDB; > +INSERT INTO t2 VALUES (8),(7),(1); > +CREATE TABLE t3 (f3 INT, i3 INT, KEY(i3)) ENGINE=InnoDB; > +CREATE ALGORITHM=MERGE VIEW v3 AS SELECT * FROM t3; > +INSERT INTO t3 VALUES (8,0),(6,3),(2,8),(3,8),(1,6),(0,0),(1,0),(1,5); > +CREATE TABLE t4 (i4 INT, f4 INT, KEY(i4)) ENGINE=InnoDB; > +INSERT INTO t4 VALUES (0,0),(4,0),(0,2),(1,0),(2,1),(2,7),(6,3),(8,7),(8,1),(1,0),(7,2),(6,0),(8,1); > +SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2, t3 WHERE i3 = i2 AND f1 IN ( SELECT f3 FROM v3, t4 WHERE i4 = f3 AND f4 <> f3 ) ); > +f1 > +6 > +ANALYZE TABLE t1,t2,t3,t4; > +Table Op Msg_type Msg_text > +test.t1 analyze status OK > +test.t2 analyze status OK > +test.t3 analyze status OK > +test.t4 analyze status OK > +SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2, t3 WHERE i3 = i2 AND f1 IN ( SELECT f3 FROM v3, t4 WHERE i4 = f3 AND f4 <> f3 ) ); > +f1 > +6 > +DROP VIEW v3; > +DROP TABLE t1, t2, t3, t4; > # This must be the last in the file: > set optimizer_switch=@subselect_sj2_tmp; > set optimizer_switch=default; > diff --git a/mysql-test/t/subselect_sj2.test b/mysql-test/t/subselect_sj2.test > index a948b08..5b745ca 100644 > --- a/mysql-test/t/subselect_sj2.test > +++ b/mysql-test/t/subselect_sj2.test > @@ -1464,5 +1464,29 @@ WHERE a IN ( SELECT b FROM t2 LEFT JOIN v3 ON ( c = b ) ) ; > DROP TABLE t1,t2,t3; > DROP VIEW v3; > > +--echo # > +--echo # MDEV-11108: Assertion `uniq_tuple_length_arg <= table->file->max_key_length()' failed in SJ_TMP_TABLE::create_sj_weedout_tmp_table > +--echo # > + > +CREATE TABLE t1 (f1 INT) ENGINE=InnoDB; > +INSERT INTO t1 VALUES (4),(6); > + > +CREATE TABLE t2 (i2 INT, KEY(i2)) ENGINE=InnoDB; > +INSERT INTO t2 VALUES (8),(7),(1); > + > +CREATE TABLE t3 (f3 INT, i3 INT, KEY(i3)) ENGINE=InnoDB; > +CREATE ALGORITHM=MERGE VIEW v3 AS SELECT * FROM t3; > +INSERT INTO t3 VALUES (8,0),(6,3),(2,8),(3,8),(1,6),(0,0),(1,0),(1,5); > + > +CREATE TABLE t4 (i4 INT, f4 INT, KEY(i4)) ENGINE=InnoDB; > +INSERT INTO t4 VALUES (0,0),(4,0),(0,2),(1,0),(2,1),(2,7),(6,3),(8,7),(8,1),(1,0),(7,2),(6,0),(8,1); > + > +SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2, t3 WHERE i3 = i2 AND f1 IN ( SELECT f3 FROM v3, t4 WHERE i4 = f3 AND f4 <> f3 ) ); > +ANALYZE TABLE t1,t2,t3,t4; > +SELECT * FROM t1 WHERE EXISTS ( SELECT * FROM t2, t3 WHERE i3 = i2 AND f1 IN ( SELECT f3 FROM v3, t4 WHERE i4 = f3 AND f4 <> f3 ) ); > + > +DROP VIEW v3; > +DROP TABLE t1, t2, t3, t4; > + > --echo # This must be the last in the file: > set optimizer_switch=@subselect_sj2_tmp; > diff --git a/sql/sql_select.cc b/sql/sql_select.cc > index 151e341..135ad9a 100644 > --- a/sql/sql_select.cc > +++ b/sql/sql_select.cc > @@ -9735,8 +9735,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) > !(used_tables & tab->emb_sj_nest->sj_inner_tables)) > { > save_used_tables= used_tables; > - used_tables= join->const_table_map | OUTER_REF_TABLE_BIT | > - RAND_TABLE_BIT; > + used_tables= join->const_table_map | RAND_TABLE_BIT; > } > > /* > @@ -9744,7 +9743,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) > It solve problem with select like SELECT * FROM t1 WHERE rand() > 0.5 > */ > if (tab == join->join_tab + join->top_join_tab_count - 1) > - current_map|= OUTER_REF_TABLE_BIT | RAND_TABLE_BIT; > + current_map|= RAND_TABLE_BIT; > used_tables|=current_map; > > if (tab->type == JT_REF && tab->quick && > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

1 0

Re: [Maria-developers] MDEV-12238 Add Type_handler::Item_func_{plus|minus|mul|div|mod}_fix_length_and_dec()
by Alexander Barkov 04 Apr '17

04 Apr '17

Hello Alexey, Thanks for your review. Please find an updated version attached. On 03/19/2017 08:12 PM, Alexey Botchkov wrote: > Hi, Alexander. > > The patch is ok to push. > I only have two cosmetical recommendation. > 1. const Pair* find_pair() implementation belongs to sql_type.cc. A bit > too long for the .h file. Moved. > 2. I'd create the enum {NOT_COMMUTATIVE, COMMUTATIVE} and use it as the > parameter for the find_pair() and related functions. Makes code much > more understandable. As agreed on IRC, I created a new class Type_aggregator_commutative instead. Thanks! > > Best regards. > HF > > On Mon, Mar 13, 2017 at 3:41 PM, Alexander Barkov <bar(a)mariadb.org > <mailto:bar@mariadb.org>> wrote: > > Hello Alexey, > > Please review a patch for MDEV-12238. > > Thanks! > >

1 1

[Maria-developers] Please review a patch removing LEX::text_string_is_7bit
by Alexander Barkov 04 Apr '17

04 Apr '17

Hello Sergei, Can you please review a patch for bb-10.2-ext fixing the problem that in case of possible changes in look-ahead in rules using TEXT_STRING or NCHAR_STRING, Lex->text_string_is_7bit can get out of sync with $1/$2/$3, etc. Thanks!

2 2

[Maria-developers] JDBC getWarnings and stored procedure
by jerome brauge 03 Apr '17

03 Apr '17

Hello, When we call a stored procedure in JDBC which emit warnings, getWarnings() always returns null. I don't really think that the problem is in MariaDB Connector J because warning flag in the EOF packet is not set to true. Mysql client behaves in the same way, by default it shows warnings count issued by DML command but not for stored procedure. Is it a normal behavior ? Best regards, Jérôme.

1 0

[Maria-developers] Please review a patch for Mdev-12019
by Sachin Setiya 03 Apr '17

03 Apr '17

Hi Monty, Please review a patch for Mdev-12019. -- Regards Sachin Setiya Software Engineer at MariaDB

1 0