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

Proposed by Hartmut Holzgraefe
Status: Needs review
Proposed branch: lp:~hartmut-php/maria/10.0-check-constraint-warning
Merge into: lp:maria
Diff against target: 68 lines (+28/-0) (has conflicts)
3 files modified
mysql-test/r/create.result (+10/-0)
mysql-test/t/create.test (+12/-0)
sql/sql_yacc.yy (+6/-0)
Text conflict in mysql-test/r/create.result
Text conflict in mysql-test/t/create.test
To merge this branch: bzr merge lp:~hartmut-php/maria/10.0-check-constraint-warning
Reviewer Review Type Date Requested Status
Sergei Golubchik Approve
Review via email: mp+159891@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Sergei Golubchik (sergii) wrote :

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

review: Approve
Revision history for this message
Hartmut Holzgraefe (hartmut-php) 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?

--
hartmut

Revision history for this message
Sergei Golubchik (sergii) wrote :

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

added warning about CHECK constraints not being supported yet

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
24181 124181 1
2419drop table t1;2419drop table t1;
2420#2420#
2421<<<<<<< TREE
2421# Checking that CREATE IF NOT EXISTS is not blocked by running SELECT2422# Checking that CREATE IF NOT EXISTS is not blocked by running SELECT
2422#2423#
2423create table t1 (a int, b int) engine=myisam;2424create table t1 (a int, b int) engine=myisam;
@@ -2445,3 +2446,12 @@
24451 124461 1
2446unlock tables;2447unlock tables;
2447drop table t1,t2;2448drop table t1,t2;
2449=======
2450# Test for CHECK(...) constraint not supported warning
2451#
2452create table if not exists t1 (a int CHECK(a < 10));
2453Warnings:
2454Warning 1235 This version of MariaDB doesn't yet support 'CHECK'
2455drop table t1;
2456#
2457>>>>>>> MERGE-SOURCE
24482458
=== 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 @@
1993 ignore select 1 as a, 1 as b union select 1 as a, 2 as b;1993 ignore select 1 as a, 1 as b union select 1 as a, 2 as b;
1994select * from t1;1994select * from t1;
1995drop table t1;1995drop table t1;
1996<<<<<<< TREE
19961997
1997--echo #1998--echo #
1998--echo # Checking that CREATE IF NOT EXISTS is not blocked by running SELECT1999--echo # Checking that CREATE IF NOT EXISTS is not blocked by running SELECT
@@ -2018,3 +2019,14 @@
2018select * from t1;2019select * from t1;
2019unlock tables;2020unlock tables;
2020drop table t1,t2;2021drop table t1,t2;
2022=======
2023
2024--echo #
2025--echo # Test for CHECK(...) constraint not supported warning
2026--echo #
2027
2028create table if not exists t1 (a int CHECK(a < 10));
2029drop table t1;
2030
2031--echo #
2032>>>>>>> MERGE-SOURCE
20212033
=== 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 @@
56105610
5611check_constraint:5611check_constraint:
5612 CHECK_SYM '(' expr ')'5612 CHECK_SYM '(' expr ')'
5613 {
5614 push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
5615 ER_NOT_SUPPORTED_YET,
5616 ER(ER_NOT_SUPPORTED_YET),
5617 "CHECK");
5618 }
5613 ;5619 ;
56145620
5615opt_constraint:5621opt_constraint:

Subscribers

People subscribed via source and target branches