Merge remote-tracking branch 'origin/pull/12688'

This commit is contained in:
Michal Čihař 2016-11-09 18:09:28 +01:00
commit 3b48533288
2 changed files with 25 additions and 1 deletions

View File

@ -37,7 +37,7 @@ USE phpmyadmin;
--
CREATE TABLE IF NOT EXISTS `pma__bookmark` (
`id` int(11) NOT NULL auto_increment,
`id` int(10) unsigned NOT NULL auto_increment,
`dbase` varchar(255) NOT NULL default '',
`user` varchar(255) NOT NULL default '',
`label` varchar(255) COLLATE utf8_general_ci NOT NULL default '',

View File

@ -0,0 +1,24 @@
-- -------------------------------------------------------------
-- SQL Commands to upgrade pmadb.pma__column_info table
-- for normal phpMyAdmin operation
--
-- This file is meant for use with phpMyAdmin 4.6.5 and above!
-- For older releases, please use create_tables.sql
--
-- Please don't forget to set up the table names in config.inc.php
--
-- --------------------------------------------------------
--
-- Database : `phpmyadmin`
--
USE `phpmyadmin`;
-- --------------------------------------------------------
--
-- Update table structure for table `pma__bookmark`
--
ALTER TABLE `pma__bookmark`
CHANGE `id` `id` int( 10 ) unsigned NOT NULL auto_increment;