commit f8653cceb6313e35b32e0b0195d3c43989134b5f
Author: cvs2git <[email protected]>
Date: Wed Feb 27 07:56:25 2008 +0000
This commit was manufactured by cvs2git to create branch 'MYSQL_5_0'.
Cherrypick from master 2008-02-27 07:56:25 UTC Arkadiusz Miśkiewicz
<[email protected]> '- updated for 5.1.23rc':
mysql-bug-34192.patch -> 1.2
mysql-system-users.patch -> 1.3
mysql-bug-34192.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
mysql-system-users.patch | 34 ++++++++++++++++++++++++++++
2 files changed, 92 insertions(+)
---
diff --git a/mysql-bug-34192.patch b/mysql-bug-34192.patch
new file mode 100644
index 0000000..d6491d4
--- /dev/null
+++ b/mysql-bug-34192.patch
@@ -0,0 +1,58 @@
+From: Chad MILLERDate: February 1 2008 5:53pm
+Subject: bk commit into 5.0 tree (cmiller:1.2572) BUG#34192
+
+Below is the list of changes that have just been committed into a local
+5.0 repository of cmiller. When cmiller does a push these changes
+will be propagated to the main repository and, within 24 hours after the
+push, to the public repository.
+For information on how to access the public repository
+see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
+
+ChangeSet@stripped, 2008-02-01 11:53:48-05:00, cmiller@stripped +1 -0
+ Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \
+ databases from 4.0 server
+
+ Contribution from Arkadiusz Miskiewicz. No CLA required for this size.
+
+ mysqldump treated a failure to set the results charset as a severe
+ error.
+
+ Now, don't try to set the charset for the SHOW CREATE TABLE statement,
+ if the dumper doesn't want SET NAMES or the remote server doesn't
+ support changing charsets.
+
+ (The original patch tried to set the charset to binary and back in
+ any case, and only exited-with-failure if the dumper wanted it and
+ the remote server supported it.)
+
+ client/mysqldump.c@stripped, 2008-02-01 11:53:46-05:00, cmiller@stripped +13
-3
+ Don't set the charset for receiving results if it's not wanted or if
+ the server doesn't support it.
+
+diff -Nrup a/client/mysqldump.c b/client/mysqldump.c
+--- a/client/mysqldump.c 2007-12-04 22:07:00 -05:00
++++ b/client/mysqldump.c 2008-02-01 11:53:46 -05:00
+@@ -1705,10 +1705,20 @@ static uint get_table_structure(char *ta
+
+ my_snprintf(buff, sizeof(buff), "show create table %s", result_table);
+
+- if (switch_character_set_results(mysql, "binary") ||
+- mysql_query_with_error_report(mysql, &result, buff) ||
+- switch_character_set_results(mysql, default_charset))
++ if (opt_set_charset) /* Was forced to false if server is too old. */
++ {
++ if (switch_character_set_results(mysql, "binary") != 0)
++ DBUG_RETURN(0);
++ }
++
++ if (mysql_query_with_error_report(mysql, &result, buff) != 0)
+ DBUG_RETURN(0);
++
++ if (opt_set_charset) /* Was forced to false if server is too old. */
++ {
++ if (switch_character_set_results(mysql, default_charset) != 0)
++ DBUG_RETURN(0);
++ }
+
+ if (path)
+ {
diff --git a/mysql-system-users.patch b/mysql-system-users.patch
new file mode 100644
index 0000000..f1e0864
--- /dev/null
+++ b/mysql-system-users.patch
@@ -0,0 +1,34 @@
+diff -ur mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql
mysql-5.1.22-rc/scripts/mysql_system_tables_data.sql
+--- mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql 2007-09-24
12:29:43.000000000 +0200
++++ mysql-5.1.22-rc/scripts/mysql_system_tables_data.sql 2007-11-24
20:22:08.360937978 +0100
+@@ -7,23 +7,16 @@
+ -- containing "@current_hostname" are filtered out by mysql_install_db.
+ set @current_hostname= @@hostname;
+
+-
+--- Fill "db" table with default grants for anyone to
+--- access database 'test' and 'test_%' if "db" table didn't exist
+-CREATE TEMPORARY TABLE tmp_db LIKE db;
+-INSERT INTO tmp_db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO tmp_db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
+-DROP TABLE tmp_db;
+-
+-
+ -- 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;
+ set @current_hostname= @@hostname;
+-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','Y','Y','','','','',0,0,0,0);
+-REPLACE INTO tmp_user VALUES
(@current_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','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','Y','Y','','','','',0,0,0,0);
++INSERT INTO tmp_user VALUES
('localhost','mysql','','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','Y','Y','','','','',0,0,0,0);
++REPLACE INTO tmp_user VALUES
(@current_hostname,'mysql','','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','Y','Y','','','','',0,0,0,0);
++REPLACE INTO tmp_user VALUES
('127.0.0.1','mysql','','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','Y','Y','','','','',0,0,0,0);
++INSERT INTO tmp_user VALUES
('localhost','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
++REPLACE INTO tmp_user VALUES
(@current_hostname,'mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
++REPLACE INTO tmp_user VALUES
('127.0.0.1','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
+ INSERT INTO tmp_user (host,user) VALUES ('localhost','');
+ INSERT INTO tmp_user (host,user) VALUES (@current_hostname,'');
+ INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
