Merge lp:~stewart/drizzle/bug802248 into lp:drizzle

[Stewart Smith]

We were treating ROW_FORMAT a bit specially in parser. We should allow any text value in there too, it's up to the engine to decide.

[Stewart Smith (stewart)]

discussed (and approved) with Brian over email

review: Approve

=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy	2013-01-29 13:10:03 +0000
+++ drizzled/sql_yacc.yy	2013-02-26 23:30:29 +0000
@@ -1155,6 +1155,7 @@
           {
             $$.assign(YYSession->mem.strdup($1.data(), $1.length), $1.length);
           }
+        | TEXT_STRING_sys { $$=$1;}
         ;
 
 opt_select_from:

=== added file 'tests/suite/regression/r/802248.result'
--- tests/suite/regression/r/802248.result	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/r/802248.result	2013-02-26 23:30:29 +0000
@@ -0,0 +1,13 @@
+create table test (a int) engine=innodb row_format=compaCT;
+show create table test;
+Table	Create Table
+test	CREATE TABLE `test` (
+  `a` INT DEFAULT NULL
+) ENGINE=InnoDB ROW_FORMAT='compaCT' COLLATE = utf8_general_ci
+drop table test;
+CREATE TABLE `test` (
+`a` INT DEFAULT NULL
+) ENGINE=InnoDB ROW_FORMAT='compaCT' COLLATE = utf8_general_ci;
+DROP TABLE test;
+create table test (a int) engine=innodb row_format='totally incorrect value';
+ERROR HY000: Unknown table engine option key/pair ROW_FORMAT = totally incorrect value.

=== added file 'tests/suite/regression/t/802248.test'
--- tests/suite/regression/t/802248.test	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/t/802248.test	2013-02-26 23:30:29 +0000
@@ -0,0 +1,9 @@
+create table test (a int) engine=innodb row_format=compaCT;
+show create table test;
+drop table test;
+ CREATE TABLE `test` (
+  `a` INT DEFAULT NULL
+) ENGINE=InnoDB ROW_FORMAT='compaCT' COLLATE = utf8_general_ci;
+DROP TABLE test;
+--error ER_UNKNOWN_ENGINE_OPTION
+create table test (a int) engine=innodb row_format='totally incorrect value';