Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorDeven Bansod <devenbansod.bits@gmail.com>2015-06-24 20:44:18 +0300
committerDeven Bansod <devenbansod.bits@gmail.com>2015-06-24 21:44:06 +0300
commit3d1157c944b75d427e48475ffa2b94d95aa1b2bc (patch)
treefdbae379faa7e88fd885d32c89e11db1e86f1bd0 /sql
parentdd7230cc209837fac06111c0e41dcad33ce0c07e (diff)
Changed the mysql reserved words conflicting column names
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
Diffstat (limited to 'sql')
-rw-r--r--sql/create_tables.sql6
-rw-r--r--sql/create_tables_drizzle.sql6
2 files changed, 6 insertions, 6 deletions
diff --git a/sql/create_tables.sql b/sql/create_tables.sql
index 1a793b744e..5b55d1e5d7 100644
--- a/sql/create_tables.sql
+++ b/sql/create_tables.sql
@@ -330,9 +330,9 @@ CREATE TABLE IF NOT EXISTS `pma__central_columns` (
CREATE TABLE IF NOT EXISTS `pma__designer_settings` (
`username` varchar(64) NOT NULL,
- `index` varchar(64) NOT NULL,
- `value` varchar(64) NOT NULL,
- PRIMARY KEY (`username`,`index`)
+ `setting` varchar(64) NOT NULL,
+ `stored_value` varchar(64) NOT NULL,
+ PRIMARY KEY (`username`,`setting`)
)
COMMENT='Settings related to Designer'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/sql/create_tables_drizzle.sql b/sql/create_tables_drizzle.sql
index f98120de16..e0c8342b76 100644
--- a/sql/create_tables_drizzle.sql
+++ b/sql/create_tables_drizzle.sql
@@ -282,9 +282,9 @@ CREATE TABLE IF NOT EXISTS `pma__savedsearches` (
CREATE TABLE IF NOT EXISTS `pma__designer_settings` (
`username` varchar(64) NOT NULL,
- `index` varchar(64) NOT NULL,
- `value` varchar(64) NOT NULL,
- PRIMARY KEY (`username`,`index`)
+ `setting` varchar(64) NOT NULL,
+ `stored_value` varchar(64) NOT NULL,
+ PRIMARY KEY (`username`,`setting`)
)
COMMENT='Settings related to Designer'
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;