do not quote numbers in the DEFAULT clause in SHOW CREATE

2025-12-24 11:21:21 +03:00 · 2016-07-19 11:18:58 +02:00
parent c5c9128af6
commit 6820bf9ca9
103 changed files with 4256 additions and 4252 deletions
--- a/mysql-test/suite/engines/funcs/r/ta_set_drop_default.result
+++ b/mysql-test/suite/engines/funcs/r/ta_set_drop_default.result
@@ -19,7 +19,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
-  `c2` tinyint(4) DEFAULT '10',
+  `c2` tinyint(4) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -60,7 +60,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
-  `c2` smallint(6) DEFAULT '10',
+  `c2` smallint(6) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -101,7 +101,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
-  `c2` mediumint(9) DEFAULT '10',
+  `c2` mediumint(9) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -142,7 +142,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
-  `c2` int(11) DEFAULT '10',
+  `c2` int(11) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -183,7 +183,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
-  `c2` int(11) DEFAULT '10',
+  `c2` int(11) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -224,7 +224,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
-  `c2` bigint(20) DEFAULT '10',
+  `c2` bigint(20) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -265,7 +265,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` double NOT NULL,
-  `c2` double DEFAULT '10',
+  `c2` double DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -306,7 +306,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` double NOT NULL,
-  `c2` double DEFAULT '10',
+  `c2` double DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -347,7 +347,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` float NOT NULL,
-  `c2` float DEFAULT '10',
+  `c2` float DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -388,7 +388,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` decimal(10,0) NOT NULL,
-  `c2` decimal(10,0) DEFAULT '10',
+  `c2` decimal(10,0) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -429,7 +429,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` decimal(10,0) NOT NULL,
-  `c2` decimal(10,0) DEFAULT '10',
+  `c2` decimal(10,0) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER   c2 DROP DEFAULT;
@@ -470,7 +470,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` tinyint(4) NOT NULL,
-  `c2` tinyint(4) DEFAULT '10',
+  `c2` tinyint(4) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -511,7 +511,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` smallint(6) NOT NULL,
-  `c2` smallint(6) DEFAULT '10',
+  `c2` smallint(6) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -552,7 +552,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` mediumint(9) NOT NULL,
-  `c2` mediumint(9) DEFAULT '10',
+  `c2` mediumint(9) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -593,7 +593,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
-  `c2` int(11) DEFAULT '10',
+  `c2` int(11) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -634,7 +634,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` int(11) NOT NULL,
-  `c2` int(11) DEFAULT '10',
+  `c2` int(11) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -675,7 +675,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` bigint(20) NOT NULL,
-  `c2` bigint(20) DEFAULT '10',
+  `c2` bigint(20) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -716,7 +716,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` double NOT NULL,
-  `c2` double DEFAULT '10',
+  `c2` double DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -757,7 +757,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` double NOT NULL,
-  `c2` double DEFAULT '10',
+  `c2` double DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -798,7 +798,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` float NOT NULL,
-  `c2` float DEFAULT '10',
+  `c2` float DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -839,7 +839,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` decimal(10,0) NOT NULL,
-  `c2` decimal(10,0) DEFAULT '10',
+  `c2` decimal(10,0) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -880,7 +880,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
  `c1` decimal(10,0) NOT NULL,
-  `c2` decimal(10,0) DEFAULT '10',
+  `c2` decimal(10,0) DEFAULT 10,
  PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
--- a/mysql-test/suite/engines/funcs/r/tc_column_default_decimal.result
+++ b/mysql-test/suite/engines/funcs/r/tc_column_default_decimal.result
@@ -7,7 +7,7 @@ t12
 SHOW CREATE TABLE t12;
 Table	Create Table
 t12	CREATE TABLE `t12` (
-  `c1` decimal(5,0) DEFAULT '2'
+  `c1` decimal(5,0) DEFAULT 2
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t12;
 SHOW TABLES;
@@ -19,7 +19,7 @@ t13
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
-  `c1` decimal(5,4) DEFAULT '3.1234'
+  `c1` decimal(5,4) DEFAULT 3.1234
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t13;
 SHOW TABLES;
@@ -31,7 +31,7 @@ t12
 SHOW CREATE TABLE t12;
 Table	Create Table
 t12	CREATE TABLE `t12` (
-  `c1` decimal(5,0) DEFAULT '2'
+  `c1` decimal(5,0) DEFAULT 2
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t12;
 SHOW TABLES;
@@ -43,7 +43,7 @@ t13
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
-  `c1` decimal(5,4) DEFAULT '3.1234'
+  `c1` decimal(5,4) DEFAULT 3.1234
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t13;
 SHOW TABLES;
@@ -55,7 +55,7 @@ t12
 SHOW CREATE TABLE t12;
 Table	Create Table
 t12	CREATE TABLE `t12` (
-  `c1` decimal(5,0) DEFAULT '2'
+  `c1` decimal(5,0) DEFAULT 2
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t12;
 SHOW TABLES;
@@ -67,7 +67,7 @@ t13
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
-  `c1` decimal(5,4) DEFAULT '3.1234'
+  `c1` decimal(5,4) DEFAULT 3.1234
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t13;
 SHOW TABLES;
@@ -79,7 +79,7 @@ t12
 SHOW CREATE TABLE t12;
 Table	Create Table
 t12	CREATE TABLE `t12` (
-  `c1` decimal(5,0) DEFAULT '2'
+  `c1` decimal(5,0) DEFAULT 2
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t12;
 SHOW TABLES;
@@ -91,7 +91,7 @@ t13
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
-  `c1` decimal(5,4) DEFAULT '3.1234'
+  `c1` decimal(5,4) DEFAULT 3.1234
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t13;
 SHOW TABLES;
@@ -103,7 +103,7 @@ t12
 SHOW CREATE TABLE t12;
 Table	Create Table
 t12	CREATE TABLE `t12` (
-  `c1` decimal(5,0) NOT NULL DEFAULT '2'
+  `c1` decimal(5,0) NOT NULL DEFAULT 2
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t12;
 SHOW TABLES;
@@ -115,7 +115,7 @@ t13
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
-  `c1` decimal(5,4) NOT NULL DEFAULT '3.1234'
+  `c1` decimal(5,4) NOT NULL DEFAULT 3.1234
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t13;
 SHOW TABLES;
@@ -127,7 +127,7 @@ t12
 SHOW CREATE TABLE t12;
 Table	Create Table
 t12	CREATE TABLE `t12` (
-  `c1` decimal(5,0) NOT NULL DEFAULT '2'
+  `c1` decimal(5,0) NOT NULL DEFAULT 2
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t12;
 SHOW TABLES;
@@ -139,7 +139,7 @@ t13
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
-  `c1` decimal(5,4) NOT NULL DEFAULT '3.1234'
+  `c1` decimal(5,4) NOT NULL DEFAULT 3.1234
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t13;
 SHOW TABLES;
@@ -151,7 +151,7 @@ t12
 SHOW CREATE TABLE t12;
 Table	Create Table
 t12	CREATE TABLE `t12` (
-  `c1` decimal(5,0) NOT NULL DEFAULT '2'
+  `c1` decimal(5,0) NOT NULL DEFAULT 2
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t12;
 SHOW TABLES;
@@ -163,7 +163,7 @@ t13
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
-  `c1` decimal(5,4) NOT NULL DEFAULT '3.1234'
+  `c1` decimal(5,4) NOT NULL DEFAULT 3.1234
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t13;
 SHOW TABLES;
@@ -175,7 +175,7 @@ t12
 SHOW CREATE TABLE t12;
 Table	Create Table
 t12	CREATE TABLE `t12` (
-  `c1` decimal(5,0) NOT NULL DEFAULT '2'
+  `c1` decimal(5,0) NOT NULL DEFAULT 2
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t12;
 SHOW TABLES;
@@ -187,7 +187,7 @@ t13
 SHOW CREATE TABLE t13;
 Table	Create Table
 t13	CREATE TABLE `t13` (
-  `c1` decimal(5,4) NOT NULL DEFAULT '3.1234'
+  `c1` decimal(5,4) NOT NULL DEFAULT 3.1234
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t13;
 SHOW TABLES;
--- a/mysql-test/suite/engines/funcs/r/tc_column_default_number.result
+++ b/mysql-test/suite/engines/funcs/r/tc_column_default_number.result
@@ -6,7 +6,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` tinyint(5) DEFAULT '1'
+  `c1` tinyint(5) DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -18,7 +18,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` smallint(5) DEFAULT '1'
+  `c1` smallint(5) DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -30,7 +30,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` mediumint(5) DEFAULT '1'
+  `c1` mediumint(5) DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -42,7 +42,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` int(5) DEFAULT '1'
+  `c1` int(5) DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -54,7 +54,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` int(5) DEFAULT '1'
+  `c1` int(5) DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -66,7 +66,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` bigint(5) DEFAULT '1'
+  `c1` bigint(5) DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -78,7 +78,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` tinyint(5) NOT NULL DEFAULT '1'
+  `c1` tinyint(5) NOT NULL DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -90,7 +90,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` smallint(5) NOT NULL DEFAULT '1'
+  `c1` smallint(5) NOT NULL DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -102,7 +102,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` mediumint(5) NOT NULL DEFAULT '1'
+  `c1` mediumint(5) NOT NULL DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -114,7 +114,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` int(5) NOT NULL DEFAULT '1'
+  `c1` int(5) NOT NULL DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -126,7 +126,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` int(5) NOT NULL DEFAULT '1'
+  `c1` int(5) NOT NULL DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
@@ -138,7 +138,7 @@ t11
 SHOW CREATE TABLE t11;
 Table	Create Table
 t11	CREATE TABLE `t11` (
-  `c1` bigint(5) NOT NULL DEFAULT '1'
+  `c1` bigint(5) NOT NULL DEFAULT 1
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t11;
 SHOW TABLES;
--- a/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result
+++ b/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result