[vhffs-dev] [2080] updated mysql patch, InnoDB checks if the mysql.db. U

[vhffs-dev] [2080] updated mysql patch, InnoDB checks if the mysql.db. User field is a char(16) through sql/sql_acl.cc mysql_db_table_fields, fixed

[ Thread Index | Date Index | More vhffs.org/vhffs-dev Archives ]

To: vhffs-dev@xxxxxxxxx
Subject: [vhffs-dev] [2080] updated mysql patch, InnoDB checks if the mysql.db. User field is a char(16) through sql/sql_acl.cc mysql_db_table_fields, fixed
From: subversion@xxxxxxxxxxxxx
Date: Tue, 28 Feb 2012 22:57:20 +0100

Revision: 2080
Author:   gradator
Date:     2012-02-28 22:57:19 +0100 (Tue, 28 Feb 2012)
Log Message:
-----------
updated mysql patch, InnoDB checks if the mysql.db.User field is a char(16) through sql/sql_acl.cc mysql_db_table_fields, fixed

Modified Paths:
--------------
    trunk/vhffs-packages/patches/mysql/200_mysql-5.1-5.1.49-username-length.dpatch

Modified: trunk/vhffs-packages/patches/mysql/200_mysql-5.1-5.1.49-username-length.dpatch
===================================================================
--- trunk/vhffs-packages/patches/mysql/200_mysql-5.1-5.1.49-username-length.dpatch	2012-02-28 19:30:20 UTC (rev 2079)
+++ trunk/vhffs-packages/patches/mysql/200_mysql-5.1-5.1.49-username-length.dpatch	2012-02-28 21:57:19 UTC (rev 2080)
@@ -2,12 +2,12 @@
 ## 200_mysql-5.1-5.1.49-username-length.dpatch
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: TuxFamily patch to raise the username name length from 16 to 64 characters
+## DP: TuxFamily patch to raise the username name length from 16 to 32 characters
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.49~/include/mysql_com.h mysql-5.1-5.1.49/include/mysql_com.h
---- mysql-5.1-5.1.49~/include/mysql_com.h	2010-07-09 14:34:59.000000000 +0200
-+++ mysql-5.1-5.1.49/include/mysql_com.h	2011-07-10 16:27:39.000000000 +0200
+diff -urNad a//include/mysql_com.h b//include/mysql_com.h
+--- a//include/mysql_com.h	2010-07-09 12:34:59.000000000 +0000
++++ b//include/mysql_com.h	2012-02-28 21:07:22.784976286 +0000
 @@ -23,7 +23,7 @@
  #define HOSTNAME_LENGTH 60
  #define SYSTEM_CHARSET_MBMAXLEN 3
@@ -17,9 +17,9 @@
  #define NAME_LEN                (NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN)
  #define USERNAME_LENGTH         (USERNAME_CHAR_LENGTH*SYSTEM_CHARSET_MBMAXLEN)
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.49~/scripts/mysql_fix_privilege_tables.sql mysql-5.1-5.1.49/scripts/mysql_fix_privilege_tables.sql
---- mysql-5.1-5.1.49~/scripts/mysql_fix_privilege_tables.sql	2010-07-09 14:42:33.000000000 +0200
-+++ mysql-5.1-5.1.49/scripts/mysql_fix_privilege_tables.sql	2011-07-10 16:31:52.000000000 +0200
+diff -urNad a//scripts/mysql_fix_privilege_tables.sql b//scripts/mysql_fix_privilege_tables.sql
+--- a//scripts/mysql_fix_privilege_tables.sql	2010-07-09 12:42:33.000000000 +0000
++++ b//scripts/mysql_fix_privilege_tables.sql	2012-02-28 21:07:22.784976286 +0000
 @@ -5,7 +5,7 @@
  set sql_mode='';
  set storage_engine=myisam;
@@ -95,9 +95,9 @@
    ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
  ALTER TABLE db
    MODIFY  Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.49~/scripts/mysql_fix_privilege_tables_sql.c mysql-5.1-5.1.49/scripts/mysql_fix_privilege_tables_sql.c
---- mysql-5.1-5.1.49~/scripts/mysql_fix_privilege_tables_sql.c	2010-07-09 14:42:36.000000000 +0200
-+++ mysql-5.1-5.1.49/scripts/mysql_fix_privilege_tables_sql.c	2011-07-10 16:30:53.000000000 +0200
+diff -urNad a//scripts/mysql_fix_privilege_tables_sql.c b//scripts/mysql_fix_privilege_tables_sql.c
+--- a//scripts/mysql_fix_privilege_tables_sql.c	2010-07-09 12:42:36.000000000 +0000
++++ b//scripts/mysql_fix_privilege_tables_sql.c	2012-02-28 21:07:22.788976291 +0000
 @@ -6,7 +6,7 @@
  "set sql_mode='';\n "
  "set storage_engine=myisam;\n "
@@ -174,9 +174,48 @@
  "  ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;\n "
  "ALTER TABLE db\n "
  "  MODIFY  Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,\n "
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.49~/scripts/mysql_system_tables.sql mysql-5.1-5.1.49/scripts/mysql_system_tables.sql
---- mysql-5.1-5.1.49~/scripts/mysql_system_tables.sql	2010-07-09 14:35:12.000000000 +0200
-+++ mysql-5.1-5.1.49/scripts/mysql_system_tables.sql	2011-07-10 16:29:09.000000000 +0200
+diff -urNad a//scripts/mysql_system_tables_fix.sql b//scripts/mysql_system_tables_fix.sql
+--- a//scripts/mysql_system_tables_fix.sql	2010-07-09 12:34:56.000000000 +0000
++++ b//scripts/mysql_system_tables_fix.sql	2012-02-28 21:07:22.788976291 +0000
+@@ -47,7 +47,7 @@
+ ALTER TABLE tables_priv
+   MODIFY Host char(60) NOT NULL default '',
+   MODIFY Db char(64) NOT NULL default '',
+-  MODIFY User char(16) NOT NULL default '',
++  MODIFY User char(32) NOT NULL default '',
+   MODIFY Table_name char(64) NOT NULL default '',
+   MODIFY Grantor char(77) NOT NULL default '',
+   ENGINE=MyISAM,
+@@ -75,7 +75,7 @@
+ ALTER TABLE columns_priv
+   MODIFY Host char(60) NOT NULL default '',
+   MODIFY Db char(64) NOT NULL default '',
+-  MODIFY User char(16) NOT NULL default '',
++  MODIFY User char(32) NOT NULL default '',
+   MODIFY Table_name char(64) NOT NULL default '',
+   MODIFY Column_name char(64) NOT NULL default '',
+   ENGINE=MyISAM,
+@@ -146,7 +146,7 @@
+ # and reset all char columns to correct width
+ ALTER TABLE user
+   MODIFY Host char(60) NOT NULL default '',
+-  MODIFY User char(16) NOT NULL default '',
++  MODIFY User char(32) NOT NULL default '',
+   ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+ ALTER TABLE user
+   MODIFY Password char(41) character set latin1 collate latin1_bin NOT NULL default '',
+@@ -176,7 +176,7 @@
+ ALTER TABLE db
+   MODIFY Host char(60) NOT NULL default '',
+   MODIFY Db char(64) NOT NULL default '',
+-  MODIFY User char(16) NOT NULL default '',
++  MODIFY User char(32) NOT NULL default '',
+   ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+ ALTER TABLE db
+   MODIFY  Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
+diff -urNad a//scripts/mysql_system_tables.sql b//scripts/mysql_system_tables.sql
+--- a//scripts/mysql_system_tables.sql	2010-07-09 12:35:12.000000000 +0000
++++ b//scripts/mysql_system_tables.sql	2012-02-28 21:07:22.788976291 +0000
 @@ -5,7 +5,7 @@
  set sql_mode='';
  set storage_engine=myisam;
@@ -216,42 +255,15 @@
  
  -- Create general_log if CSV is enabled.
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' mysql-5.1-5.1.49~/scripts/mysql_system_tables_fix.sql mysql-5.1-5.1.49/scripts/mysql_system_tables_fix.sql
---- mysql-5.1-5.1.49~/scripts/mysql_system_tables_fix.sql	2010-07-09 14:34:56.000000000 +0200
-+++ mysql-5.1-5.1.49/scripts/mysql_system_tables_fix.sql	2011-07-10 16:29:39.000000000 +0200
-@@ -47,7 +47,7 @@
- ALTER TABLE tables_priv
-   MODIFY Host char(60) NOT NULL default '',
-   MODIFY Db char(64) NOT NULL default '',
--  MODIFY User char(16) NOT NULL default '',
-+  MODIFY User char(32) NOT NULL default '',
-   MODIFY Table_name char(64) NOT NULL default '',
-   MODIFY Grantor char(77) NOT NULL default '',
-   ENGINE=MyISAM,
-@@ -75,7 +75,7 @@
- ALTER TABLE columns_priv
-   MODIFY Host char(60) NOT NULL default '',
-   MODIFY Db char(64) NOT NULL default '',
--  MODIFY User char(16) NOT NULL default '',
-+  MODIFY User char(32) NOT NULL default '',
-   MODIFY Table_name char(64) NOT NULL default '',
-   MODIFY Column_name char(64) NOT NULL default '',
-   ENGINE=MyISAM,
-@@ -146,7 +146,7 @@
- # and reset all char columns to correct width
- ALTER TABLE user
-   MODIFY Host char(60) NOT NULL default '',
--  MODIFY User char(16) NOT NULL default '',
-+  MODIFY User char(32) NOT NULL default '',
-   ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
- ALTER TABLE user
-   MODIFY Password char(41) character set latin1 collate latin1_bin NOT NULL default '',
-@@ -176,7 +176,7 @@
- ALTER TABLE db
-   MODIFY Host char(60) NOT NULL default '',
-   MODIFY Db char(64) NOT NULL default '',
--  MODIFY User char(16) NOT NULL default '',
-+  MODIFY User char(32) NOT NULL default '',
-   ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
- ALTER TABLE db
-   MODIFY  Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
+diff -urNad a//sql/sql_acl.cc b//sql/sql_acl.cc
+--- a//sql/sql_acl.cc	2010-07-09 12:34:57.000000000 +0000
++++ b//sql/sql_acl.cc	2012-02-28 21:07:34.176809616 +0000
+@@ -45,7 +45,7 @@
+   }, 
+   {
+     { C_STRING_WITH_LEN("User") },
+-    { C_STRING_WITH_LEN("char(16)") },
++    { C_STRING_WITH_LEN("char(32)") },
+     {NULL, 0}
+   },
+   {

Messages sorted by: [ date | thread ]
Prev by Date: [vhffs-dev] [2079] added Vhffs::UserGroup documentation
Next by Date: [vhffs-dev] [2081] reworked broadcasts, Vhffs::Broadcast is now a lovely object, SQL queries removed from robots and beautified, and so on...
Previous by thread: [vhffs-dev] [2079] added Vhffs::UserGroup documentation
Next by thread: [vhffs-dev] [2081] reworked broadcasts, Vhffs::Broadcast is now a lovely object, SQL queries removed from robots and beautified, and so on...

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/