Hello community, here is the log from the commit of package mysql checked in at Fri Oct 24 15:20:56 CEST 2008. -------- --- mysql/mysql.changes 2008-09-25 17:11:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2008-10-23 18:25:11.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 23 18:24:37 CEST 2008 - mmarek@suse.cz + +- fix mysql_install_db when the hostname is 'localhost' + (bnc#429618, mysql#35754) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- minmem New: ---- mysql-5.0.67-mysql_install_db-localhost.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.D22856/_old 2008-10-24 15:20:29.000000000 +0200 +++ /var/tmp/diff_new_pack.D22856/_new 2008-10-24 15:20:29.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL v2 only Group: Productivity/Databases/Servers Version: 5.0.67 -Release: 11 +Release: 12 # required by rcmysql Requires: mysql-client = %{version} Url: http://www.mysql.com @@ -47,6 +47,7 @@ Patch15: mysql-vpath.patch Patch16: mysql-5.0.67-mysql_config.patch Patch17: mysql-5.0.67-CVE-2008-2079.patch +Patch18: mysql-5.0.67-mysql_install_db-localhost.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -262,6 +263,7 @@ %patch15 %patch16 %patch17 +%patch18 # remove unneeded man manpages rm man/mysqlman.1 man/safe_mysqld.1 man/mysql.server.1 man/make_win_*.1 rm man/mysqlmanager-pwgen.1 man/mysqlmanagerc.1 @@ -583,6 +585,9 @@ %files tools -f mysql-tools.files %changelog +* Thu Oct 23 2008 mmarek@suse.cz +- fix mysql_install_db when the hostname is 'localhost' + (bnc#429618, mysql#35754) * Thu Sep 25 2008 mmarek@suse.cz - build -max and -debug with --with-big-tables and archive, csv, example, blackhole and federated engines to match the binary ++++++ mysql-5.0.67-mysql_install_db-localhost.patch ++++++ === modified file 'mysql-test/r/rpl_grant.result' --- mysql-test/r/rpl_grant.result 2008-01-29 11:21:21 +0000 +++ mysql-test/r/rpl_grant.result 2008-09-24 12:59:56 +0000 @@ -12,18 +12,18 @@ dummy localhost dummy1 localhost dummy2 localhost -SELECT COUNT(*) FROM mysql.user; +SELECT COUNT(*) FROM mysql.user WHERE user != 'root' or (host != 'localhost' and host != @hostname); COUNT(*) -6 +3 **** On Slave **** SELECT user,host FROM mysql.user WHERE user != 'root'; user host dummy localhost dummy1 localhost dummy2 localhost -SELECT COUNT(*) FROM mysql.user; +SELECT COUNT(*) FROM mysql.user WHERE user != 'root' or (host != 'localhost' and host != @hostname); COUNT(*) -6 +3 **** On Master **** DROP USER nonexisting@localhost; ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost' @@ -32,15 +32,15 @@ DROP USER dummy1@localhost, dummy2@localhost; SELECT user, host FROM mysql.user WHERE user != 'root'; user host -SELECT COUNT(*) FROM mysql.user; +SELECT COUNT(*) FROM mysql.user WHERE user != 'root' or (host != 'localhost' and host != @hostname); COUNT(*) -3 +0 **** On Slave **** SELECT user,host FROM mysql.user WHERE user != 'root'; user host -SELECT COUNT(*) FROM mysql.user; +SELECT COUNT(*) FROM mysql.user WHERE user != 'root' or (host != 'localhost' and host != @hostname); COUNT(*) -3 +0 SHOW SLAVE STATUS; Slave_IO_State # Master_Host 127.0.0.1 === modified file 'mysql-test/t/rpl_grant.test' --- mysql-test/t/rpl_grant.test 2007-06-21 14:55:52 +0000 +++ mysql-test/t/rpl_grant.test 2008-09-24 12:59:56 +0000 @@ -10,11 +10,11 @@ CREATE USER dummy1@localhost, dummy2@localhost; SELECT user, host FROM mysql.user WHERE user != 'root'; # root host non-determ -SELECT COUNT(*) FROM mysql.user; +SELECT COUNT(*) FROM mysql.user WHERE user != 'root' or (host != 'localhost' and host != @hostname); sync_slave_with_master; --echo **** On Slave **** SELECT user,host FROM mysql.user WHERE user != 'root'; # root host non-determ -SELECT COUNT(*) FROM mysql.user; +SELECT COUNT(*) FROM mysql.user WHERE user != 'root' or (host != 'localhost' and host != @hostname); --echo **** On Master **** connection master; @@ -31,11 +31,11 @@ DROP USER dummy1@localhost, dummy2@localhost; SELECT user, host FROM mysql.user WHERE user != 'root'; # root host non-determ -SELECT COUNT(*) FROM mysql.user; +SELECT COUNT(*) FROM mysql.user WHERE user != 'root' or (host != 'localhost' and host != @hostname); sync_slave_with_master; --echo **** On Slave **** SELECT user,host FROM mysql.user WHERE user != 'root'; # root host non-determ -SELECT COUNT(*) FROM mysql.user; +SELECT COUNT(*) FROM mysql.user WHERE user != 'root' or (host != 'localhost' and host != @hostname); --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 23 # 33 # === modified file 'scripts/mysql_system_tables_data.sql' --- scripts/mysql_system_tables_data.sql 2007-11-30 05:14:43 +0000 +++ scripts/mysql_system_tables_data.sql 2008-09-24 12:59:56 +0000 @@ -21,9 +21,9 @@ -- 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 (@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','','','','',0,0,0,0); +REPLACE INTO tmp_user SELECT @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','','','','',0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost'; 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 tmp_user (host,user) VALUES ('localhost',''); -INSERT INTO tmp_user (host,user) VALUES (@current_hostname,''); +INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost'; INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0; DROP TABLE tmp_user; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org