Mysql > CREATE TABLE: use 'engine' keyword instead of 'type'.

diff --git a/ChangeLog b/ChangeLog
index 8ee52db960c452b94d9c841dc954eb45f0cb68ec..1dee24ae75742db8a3716cfcfead9e9ac3797d7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-24  Nathan Bird  <nathan@acceleration.net>
+
+       * sql/expressions.lisp (output-sql): on mysql CREATE TABLE
+       statements use 'ENGINE=innodb' instead of 'Type=InnoDB'. This has
+       apparently been preferred since mysql 4.1 and mysql 5.5 removed
+       type as a valid keyword.
+
 2012-03-28  Russ Tyndall <russ@acceleration.net>
 
         * sql/sequences.lisp: [A Patch FROM 2011-07-28 changed sequences.

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index 9335ae0e0a5e0995357da7cabaa331de00778950..1479e67afa80d2edba6e5f4dc8d3bf339599640d 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -939,7 +939,7 @@ uninclusive, and the args from that keyword to the end."
       (when (and (eq :mysql (database-underlying-type database))
                  transactions
                  (db-type-transaction-capable? :mysql database))
-        (write-string " Type=InnoDB" *sql-stream*))))
+        (write-string " ENGINE=innodb" *sql-stream*))))
   t)