Merge lp:~hartmut-php/maria/10.0-check-constraint-warning into lp:maria

[Hartmut Holzgraefe]

Raise a "not supported" warning when CHECK constraints are used in CREATE or ALTER TABLE

[Sergei Golubchik (sergii)]

looks ok. please resolve the merge conflicts, run the complete test suite and feel free to push

review: Approve

[Hartmut Holzgraefe (hartmut-php)]

On 05/03/2013 05:20 PM, Sergei wrote:
> Review: Approve
>
> looks ok. please resolve the merge conflicts, run the complete test suite and feel free to push
>

how should i deal with a changelog entry for this?

--
hartmut

[Sergei Golubchik (sergii)]

Hi, Hartmut!

On May 03, Hartmut Holzgraefe wrote:
> On 05/03/2013 05:20 PM, Sergei wrote:
> > Review: Approve
> >
> > looks ok. please resolve the merge conflicts, run the complete test
> > suite and feel free to push
>
> how should i deal with a changelog entry for this?

What do you mean?
Changeset comment?
Changelog page of the next release in the KB?

Regards,
Sergei

Unmerged revisions

3491. By Hartmut Holzgraefe on 2013-04-19

added warning about CHECK constraints not being supported yet

=== modified file 'mysql-test/r/create.result'
--- mysql-test/r/create.result	2013-04-09 21:27:07 +0000
+++ mysql-test/r/create.result	2013-04-19 20:58:09 +0000
@@ -2418,6 +2418,7 @@
 1	1
 drop table t1;
 #
+<<<<<<< TREE
 # Checking that CREATE IF NOT EXISTS is not blocked by running SELECT
 #
 create table t1 (a int, b int) engine=myisam;
@@ -2445,3 +2446,12 @@
 1	1
 unlock tables;
 drop table t1,t2;
+=======
+# Test for CHECK(...) constraint not supported warning
+#
+create table if not exists t1 (a int CHECK(a < 10));
+Warnings:
+Warning	1235	This version of MariaDB doesn't yet support 'CHECK'
+drop table t1;
+#
+>>>>>>> MERGE-SOURCE

=== modified file 'mysql-test/t/create.test'
--- mysql-test/t/create.test	2013-04-09 13:35:07 +0000
+++ mysql-test/t/create.test	2013-04-19 20:58:09 +0000
@@ -1993,6 +1993,7 @@
   ignore select 1 as a, 1 as b union select 1 as a, 2 as b;
 select * from t1;
 drop table t1;
+<<<<<<< TREE
 
 --echo #
 --echo # Checking that CREATE IF NOT EXISTS is not blocked by running SELECT
@@ -2018,3 +2019,14 @@
 select * from t1;
 unlock tables;
 drop table t1,t2;
+=======
+
+--echo #
+--echo # Test for CHECK(...) constraint not supported warning
+--echo #
+
+create table if not exists t1 (a int CHECK(a < 10));
+drop table t1;
+
+--echo #
+>>>>>>> MERGE-SOURCE

=== modified file 'sql/sql_yacc.yy'
--- sql/sql_yacc.yy	2013-04-17 13:17:01 +0000
+++ sql/sql_yacc.yy	2013-04-19 20:58:09 +0000
@@ -5610,6 +5610,12 @@
 
 check_constraint:
           CHECK_SYM '(' expr ')'
+          {
+            push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
+            			ER_NOT_SUPPORTED_YET,
+                                ER(ER_NOT_SUPPORTED_YET),
+                                "CHECK");
+          }
         ;
 
 opt_constraint: