[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2081-ga9bfc2c

Marc Delisle lem9 at users.sourceforge.net
Mon Apr 26 13:42:41 CEST 2010


The branch, master has been updated
       via  a9bfc2cd5b14561477689003c47d6972d4d49f4f (commit)
       via  6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit)
      from  2154120e3a3e3eb111772c69ddc1eec72c0345f1 (commit)


- Log -----------------------------------------------------------------
commit a9bfc2cd5b14561477689003c47d6972d4d49f4f
Merge: 2154120e3a3e3eb111772c69ddc1eec72c0345f1 6393fff59dfe8fdc7d43f434fe282378c91c10c9
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Apr 26 07:42:25 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |    1 +
 scripts/create_tables.sql |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40fa43b..c5fbcc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,7 @@ $Id$
   engine to Maria, thanks to Madhura Jayaratne.
 - bug #2974067 [display] non-binary fields shown as hex
 - bug #2983065 [operations] Error when changing from Maria to MyISAM engine
+- bug #2975408 [tracking] Data too long for column data_sql
 
 3.3.2.0 (2010-04-13)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index de225ee..27c3e4d 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -185,7 +185,7 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` (
   `date_updated` datetime NOT NULL,
   `schema_snapshot` text collate utf8_bin NOT NULL,
   `schema_sql` text collate utf8_bin,
-  `data_sql` text collate utf8_bin,
+  `data_sql` longtext collate utf8_bin,
   `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL,
   `tracking_active` int(1) unsigned NOT NULL default '1',
   PRIMARY KEY  (`db_name`,`table_name`,`version`)


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list