[Pkg-mysql-commits] r864 - in branches/sid-5.0/debian: . patches
Sean Finney
seanius at alioth.debian.org
Sat May 12 08:57:16 UTC 2007
Author: seanius
Date: 2007-05-12 08:57:16 +0000 (Sat, 12 May 2007)
New Revision: 864
Removed:
branches/sid-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
branches/sid-5.0/debian/patches/34_scripts__mysql_create_system_tables__no_root.dpatch
Modified:
branches/sid-5.0/debian/changelog
branches/sid-5.0/debian/patches/00list
Log:
remove old patches
Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog 2007-05-12 08:50:21 UTC (rev 863)
+++ branches/sid-5.0/debian/changelog 2007-05-12 08:57:16 UTC (rev 864)
@@ -14,6 +14,8 @@
- Arabic. Closes: #421751
- Czech. Closes: #421766
- Portuguese. Closes: #422428
+ * upstream no longer includes the mysql_create_system_tables command,
+ so removed our local patches for it.
* the following issues may have been fixed in a previous version of
mysql-server-5.0, but the exact version is not clear so they will be
marked as fixed in this version.
Modified: branches/sid-5.0/debian/patches/00list
===================================================================
--- branches/sid-5.0/debian/patches/00list 2007-05-12 08:50:21 UTC (rev 863)
+++ branches/sid-5.0/debian/patches/00list 2007-05-12 08:57:16 UTC (rev 864)
@@ -3,8 +3,6 @@
19_man__documentation_reference.dpatch
25_mysys__default.c.dpatch
26_man__mysqldump.dpatch
-33_scripts__mysql_create_system_tables__no_test.dpatch
-34_scripts__mysql_create_system_tables__no_root.dpatch
37_scripts__mysqld_safe.sh__syslog.dpatch
38_scripts__mysqld_safe.sh__signals.dpatch
41_scripts__mysql_install_db.sh__no_test.dpatch
Deleted: branches/sid-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch 2007-05-12 08:50:21 UTC (rev 863)
+++ branches/sid-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch 2007-05-12 08:57:16 UTC (rev 864)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 33_scripts__mysql_create_system_tables__no_test.dpatch by <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: scripts__mysql_create_system_tables__no_test
-## DP: A user with no password prevents a normal user from login under certain
-## DP: circumstances as it is checked first. See #301741.
-## DP: http://bugs.mysql.com/bug.php?id=6901
-
- at DPATCH@
-
---- old/scripts/mysql_system_tables_data.sql 2007-04-06 00:17:18.000000000 +0200
-+++ new/scripts/mysql_system_tables_data.sql 2007-04-06 00:17:37.000000000 +0200
-@@ -2,10 +2,6 @@
- -- The inital data for system tables of MySQL Server
- --
-
---- default grants for anyone to access database 'test' and 'test_%'
--INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
--INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
--
- -- default users allowing root access from local machine
- INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
- REPLACE INTO user VALUES (@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
Deleted: branches/sid-5.0/debian/patches/34_scripts__mysql_create_system_tables__no_root.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/34_scripts__mysql_create_system_tables__no_root.dpatch 2007-05-12 08:50:21 UTC (rev 863)
+++ branches/sid-5.0/debian/patches/34_scripts__mysql_create_system_tables__no_root.dpatch 2007-05-12 08:57:16 UTC (rev 864)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The passwordless root account should only created on
-## DP: initial installation.
-## DP: See http://bugs.mysql.com/bug.php?id=27783
-## DP: See http://bugs.debian.org/418672
-
- at DPATCH@
-
---- old/scripts/mysql_system_tables.sql 2007-03-20 20:12:13.000000000 +0100
-+++ new/scripts/mysql_system_tables.sql 2007-04-17 00:41:19.000000000 +0200
-@@ -12,6 +12,8 @@
-
- CREATE TABLE IF NOT EXISTS user ( Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL, Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL, ssl_cipher BLOB NOT NULL, x509_issuer BLOB NOT NULL, x509_subject BLOB NOT NULL, max_questions int(11) unsigned DEFAULT 0 NOT NULL, max_updates int(11) unsigned DEFAULT 0 NOT NULL, max_connections int(11) unsigned DEFAULT 0 NOT NULL, max_user_connections int(11) unsigned DEFAULT 0 NOT NULL, PRIMARY KEY Host (Host,User) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
-
-+-- Remember for later if user table already existed
-+set @had_user_table= @@warning_count != 0;
-
- CREATE TABLE IF NOT EXISTS func ( name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User defined functions';
-
---- old/scripts/mysql_system_tables_data.sql 2007-04-17 00:47:11.000000000 +0200
-+++ new/scripts/mysql_system_tables_data.sql 2007-04-17 00:41:04.000000000 +0200
-@@ -2,8 +2,11 @@
- -- The inital data for system tables of MySQL Server
- --
-
---- default users allowing root access from local machine
--INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
--REPLACE INTO user VALUES (@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
--REPLACE INTO user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
--
-+-- Fill "users" table with default users allowing root access
-+-- from local machine if "users" table didn't exist before
-+CREATE TEMPORARY TABLE tmp_user LIKE user;
-+INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-+REPLACE INTO tmp_user VALUES (@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-+REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-+INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
-+DROP TABLE tmp_user;
More information about the Pkg-mysql-commits
mailing list