date:20161024

Re: [Maria-developers] Rewiew requested.

2016-10-24 Thread Alexey Botchkov


Right. That's for 10.2.

HF


24.10.2016 23:40, Sergey Petrunia wrote:

Hi Alexey,

I think this change is good.
Which version is it going into? (I assume, 10.2?)

On Mon, Oct 24, 2016 at 05:54:57PM +0400, Alexey Botchkov wrote:

I'd like your opinion about this difference in the result of the null.test:

--

--- /home/hf/wgit/cmt-mdev-9143/mysql-test/r/null.result 2016-10-23
13:33:54.050093010 +0400
+++ /home/hf/wgit/cmt-mdev-9143/mysql-test/r/null.reject 2016-10-24
17:31:55.553248271 +0400
@@ -1584,7 +1584,7 @@
  id select_type table   typepossible_keys   key key_len
ref rowsfilteredExtra
  1  SIMPLE  t1  ALL NULLNULLNULLNULL 3
100.00  Using where
  Warnings:
-Note   1003select `test`.`t1`.`c1` AS `c1` from `test`.`t1`
where (((`test`.`t1`.`c1` is not null) >= ((not(1 is not
null)
+Note   1003select `test`.`t1`.`c1` AS `c1` from `test`.`t1`
where (((`test`.`t1`.`c1` is not null) >= 0) is not null)
  SELECT * FROM t1 WHERE ((c1 IS NOT NULL) >= (NOT TRUE)) IS NOT NULL;
  c1
  1

--

I mean i made a change in the code that changed the test result,
which is normally not good.

Though i think here we rather have an improvement.

What do you think? Would you approve that change in the result?

See below for the patch that caused all this:

--

diff --git a/sql/item.cc b/sql/item.cc
index 448e34b..2388679 100644
--- a/sql/item.cc
   +++ b/sql/item.cc
@@ -2900,6 +2900,14 @@ void Item_int::print(String *str,
enum_query_type query_type)
   }


+Item *Item_bool::neg_transformer(THD *thd)
+{
+  value= !value;
+  name= 0;
+  return this;
+}
+
+
  Item_uint::Item_uint(THD *thd, const char *str_arg, uint length):
Item_int(thd, str_arg, length)
  {
diff --git a/sql/item.h b/sql/item.h
index 7644235..ab70fdb 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -3008,6 +3008,7 @@ class Item_bool :public Item_int
Item_bool(THD *thd, const char *str_arg, longlong i):
  Item_int(thd, str_arg, i, 1) {}
bool is_bool_type() { return true; }
+  Item *neg_transformer(THD *thd);
};

--


Best regards.

HF





___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Re: [Maria-developers] Rewiew requested.

2016-10-24 Thread Sergey Petrunia

Hi Alexey,

I think this change is good. 
Which version is it going into? (I assume, 10.2?)

On Mon, Oct 24, 2016 at 05:54:57PM +0400, Alexey Botchkov wrote:
> 
> I'd like your opinion about this difference in the result of the null.test:
> 
> --
> 
> --- /home/hf/wgit/cmt-mdev-9143/mysql-test/r/null.result 2016-10-23
> 13:33:54.050093010 +0400
> +++ /home/hf/wgit/cmt-mdev-9143/mysql-test/r/null.reject 2016-10-24
> 17:31:55.553248271 +0400
> @@ -1584,7 +1584,7 @@
>  id select_type table   typepossible_keys   key key_len
> ref rowsfilteredExtra
>  1  SIMPLE  t1  ALL NULLNULLNULLNULL 3
> 100.00  Using where
>  Warnings:
> -Note   1003select `test`.`t1`.`c1` AS `c1` from `test`.`t1`
> where (((`test`.`t1`.`c1` is not null) >= ((not(1 is not
> null)
> +Note   1003select `test`.`t1`.`c1` AS `c1` from `test`.`t1`
> where (((`test`.`t1`.`c1` is not null) >= 0) is not null)
>  SELECT * FROM t1 WHERE ((c1 IS NOT NULL) >= (NOT TRUE)) IS NOT NULL;
>  c1
>  1
> 
> --
> 
> I mean i made a change in the code that changed the test result,
> which is normally not good.
> 
> Though i think here we rather have an improvement.
> 
> What do you think? Would you approve that change in the result?
> 
> See below for the patch that caused all this:
> 
> --
> 
> diff --git a/sql/item.cc b/sql/item.cc
> index 448e34b..2388679 100644
> --- a/sql/item.cc
>   +++ b/sql/item.cc
> @@ -2900,6 +2900,14 @@ void Item_int::print(String *str,
> enum_query_type query_type)
>   }
> 
> 
> +Item *Item_bool::neg_transformer(THD *thd)
> +{
> +  value= !value;
> +  name= 0;
> +  return this;
> +}
> +
> +
>  Item_uint::Item_uint(THD *thd, const char *str_arg, uint length):
>Item_int(thd, str_arg, length)
>  {
> diff --git a/sql/item.h b/sql/item.h
> index 7644235..ab70fdb 100644
> --- a/sql/item.h
> +++ b/sql/item.h
> @@ -3008,6 +3008,7 @@ class Item_bool :public Item_int
>Item_bool(THD *thd, const char *str_arg, longlong i):
>  Item_int(thd, str_arg, i, 1) {}
>bool is_bool_type() { return true; }
> +  Item *neg_transformer(THD *thd);
> };
> 
> --
> 
> 
> Best regards.
> 
> HF
> 
> 

-- 
BR
 Sergei
-- 
Sergei Petrunia, Software Developer
MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog



___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

[Maria-developers] Rewiew requested.

2016-10-24 Thread Alexey Botchkov


Hi, Sergey.

I'd like your opinion about this difference in the result of the null.test:

--

--- /home/hf/wgit/cmt-mdev-9143/mysql-test/r/null.result 2016-10-23 
13:33:54.050093010 +0400
+++ /home/hf/wgit/cmt-mdev-9143/mysql-test/r/null.reject 2016-10-24 
17:31:55.553248271 +0400

@@ -1584,7 +1584,7 @@
 id select_type table   typepossible_keys   key key_len 
ref rowsfilteredExtra
 1  SIMPLE  t1  ALL NULLNULLNULLNULL 3   
100.00  Using where

 Warnings:
-Note   1003select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 
(((`test`.`t1`.`c1` is not null) >= ((not(1 is not null)
+Note   1003select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 
(((`test`.`t1`.`c1` is not null) >= 0) is not null)

 SELECT * FROM t1 WHERE ((c1 IS NOT NULL) >= (NOT TRUE)) IS NOT NULL;
 c1
 1

--

I mean i made a change in the code that changed the test result, which 
is normally not good.


Though i think here we rather have an improvement.

What do you think? Would you approve that change in the result?

See below for the patch that caused all this:

--

diff --git a/sql/item.cc b/sql/item.cc
index 448e34b..2388679 100644
--- a/sql/item.cc
  +++ b/sql/item.cc
@@ -2900,6 +2900,14 @@ void Item_int::print(String *str, enum_query_type 
query_type)

  }


+Item *Item_bool::neg_transformer(THD *thd)
+{
+  value= !value;
+  name= 0;
+  return this;
+}
+
+
 Item_uint::Item_uint(THD *thd, const char *str_arg, uint length):
   Item_int(thd, str_arg, length)
 {
diff --git a/sql/item.h b/sql/item.h
index 7644235..ab70fdb 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -3008,6 +3008,7 @@ class Item_bool :public Item_int
   Item_bool(THD *thd, const char *str_arg, longlong i):
 Item_int(thd, str_arg, i, 1) {}
   bool is_bool_type() { return true; }
+  Item *neg_transformer(THD *thd);
};

--


Best regards.

HF



___
Mailing list: https://launchpad.net/~maria-developers
Post to : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp

Re: [Maria-developers] [Commits] aa9bd40: MDEV-10824 - Crash in CREATE OR REPLACE TABLE t1 AS SELECT spfunc()

2016-10-24 Thread Vicențiu Ciorbaru

Hi Sergey!

I think you commited the AAA.test file by mystake.

Regards,
Vicentiu

On Mon, 24 Oct 2016 at 13:47 Sergey Vojtovich  wrote:

> revision-id: aa9bd40f8067e1421ad71d2ada367544a6db78ca
> (mariadb-10.0.27-8-gaa9bd40)
> parent(s): 4dfb6a3f54cfb26535636197cc5fa70fe5bacc2e
> committer: Sergey Vojtovich
> timestamp: 2016-10-24 15:26:11 +0400
> message:
>
> MDEV-10824 - Crash in CREATE OR REPLACE TABLE t1 AS SELECT spfunc()
>
> Code flow hit incorrect branch while closing table instances before
> removal.
> This branch expects thread to hold open table instance, whereas CREATE OR
> REPLACE doesn't actually hold open table instance.
>
> Before CREATE OR REPLACE TABLE it was impossible to hit this condition in
> LTM_PRELOCKED mode, thus the problem didn't expose itself during DROP TABLE
> or DROP DATABASE.
>
> Fixed by adjusting condition to take into account LTM_PRELOCKED mode,
> which can
> be set during CREATE OR REPLACE TABLE.
>
> ---
>  mysql-test/r/create_or_replace.result | 11 +++
>  mysql-test/t/AAA.test | 24 
>  mysql-test/t/create_or_replace.test   | 12 
>  sql/sql_parse.cc  | 12 
>  sql/sql_table.cc  |  3 ++-
>  5 files changed, 49 insertions(+), 13 deletions(-)
>
> diff --git a/mysql-test/r/create_or_replace.result
> b/mysql-test/r/create_or_replace.result
> index 3a894e9..a43dc2e 100644
> --- a/mysql-test/r/create_or_replace.result
> +++ b/mysql-test/r/create_or_replace.result
> @@ -442,3 +442,14 @@ KILL QUERY con_id;
>  ERROR 70100: Query execution was interrupted
>  drop table t1;
>  DROP TABLE t2;
> +#
> +# MDEV-10824 - Crash in CREATE OR REPLACE TABLE t1 AS SELECT spfunc()
> +#
> +CREATE TABLE t1(a INT);
> +CREATE FUNCTION f1() RETURNS VARCHAR(16383) RETURN 'test';
> +CREATE OR REPLACE TABLE t1 AS SELECT f1();
> +LOCK TABLE t1 WRITE;
> +CREATE OR REPLACE TABLE t1 AS SELECT f1();
> +UNLOCK TABLES;
> +DROP FUNCTION f1;
> +DROP TABLE t1;
> diff --git a/mysql-test/t/AAA.test b/mysql-test/t/AAA.test
> new file mode 100644
> index 000..22e22dd
> --- /dev/null
> +++ b/mysql-test/t/AAA.test
> @@ -0,0 +1,24 @@
> +CREATE TABLE t1(a INT);
> +DELIMITER $$;
> +CREATE FUNCTION f2() RETURNS VARCHAR(16383) RETURN 'test';
> +CREATE FUNCTION f1() RETURNS VARCHAR(16383)
> +BEGIN
> +  INSERT INTO t1 VALUES(1);
> +  RETURN 'test';
> +END;
> +$$
> +CREATE PROCEDURE p1() CREATE OR REPLACE TABLE t1 AS SELECT f2();
> +$$
> +DELIMITER ;$$
> +
> +CALL p1;
> +
> +#CREATE OR REPLACE TABLE t1 AS SELECT f1();
> +LOCK TABLE t1 WRITE;
> +#CREATE OR REPLACE TABLE t1 AS SELECT f1();
> +UNLOCK TABLES;
> +
> +DROP PROCEDURE p1;
> +DROP FUNCTION f1;
> +DROP FUNCTION f2;
> +DROP TABLE t1;
> diff --git a/mysql-test/t/create_or_replace.test
> b/mysql-test/t/create_or_replace.test
> index 7bba2b3..b37417f 100644
> --- a/mysql-test/t/create_or_replace.test
> +++ b/mysql-test/t/create_or_replace.test
> @@ -386,3 +386,15 @@ drop table t1;
>  # Cleanup
>  #
>  DROP TABLE t2;
> +
> +--echo #
> +--echo # MDEV-10824 - Crash in CREATE OR REPLACE TABLE t1 AS SELECT
> spfunc()
> +--echo #
> +CREATE TABLE t1(a INT);
> +CREATE FUNCTION f1() RETURNS VARCHAR(16383) RETURN 'test';
> +CREATE OR REPLACE TABLE t1 AS SELECT f1();
> +LOCK TABLE t1 WRITE;
> +CREATE OR REPLACE TABLE t1 AS SELECT f1();
> +UNLOCK TABLES;
> +DROP FUNCTION f1;
> +DROP TABLE t1;
> diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
> index cbf723c..70511fc 100644
> --- a/sql/sql_parse.cc
> +++ b/sql/sql_parse.cc
> @@ -2858,12 +2858,6 @@ case SQLCOM_PREPARE:
>  }
>
>  /*
> -  For CREATE TABLE we should not open the table even if it exists.
> -  If the table exists, we should either not create it or replace it
> -*/
> -lex->query_tables->open_strategy= TABLE_LIST::OPEN_STUB;
> -
> -/*
>If we are a slave, we should add OR REPLACE if we don't have
>IF EXISTS. This will help a slave to recover from
>CREATE TABLE OR EXISTS failures by dropping the table and
> @@ -8225,12 +8219,6 @@ bool create_table_precheck(THD *thd, TABLE_LIST
> *tables,
>if (check_fk_parent_table_access(thd, >create_info,
> >alter_info, create_table->db))
>  goto err;
>
> -  /*
> -For CREATE TABLE we should not open the table even if it exists.
> -If the table exists, we should either not create it or replace it
> -  */
> -  lex->query_tables->open_strategy= TABLE_LIST::OPEN_STUB;
> -
>error= FALSE;
>
>  err:
> diff --git a/sql/sql_table.cc b/sql/sql_table.cc
> index 7cf31ee..050a338 100644
> --- a/sql/sql_table.cc
> +++ b/sql/sql_table.cc
> @@ -2464,7 +2464,8 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST
> *tables, bool if_exists,
>if (table_type && table_type != view_pseudo_hton)
>  ha_lock_engine(thd, table_type);
>
> -  if (thd->locked_tables_mode)
> +  if (thd->locked_tables_mode == LTM_LOCK_TABLES ||
> +  thd->locked_tables_mode == LTM_PRELOCKED_UNDER_LOCK_TABLES)
>

Re: [Maria-developers] Rewiew requested.

Re: [Maria-developers] Rewiew requested.

[Maria-developers] Rewiew requested.

Re: [Maria-developers] [Commits] aa9bd40: MDEV-10824 - Crash in CREATE OR REPLACE TABLE t1 AS SELECT spfunc()

4 matches

Site Navigation

Mail list logo

Footer information