Re: bk commit into 5.0 tree (msvensson:1.2523) BUG#31167

[Mats Kindahl]

Hi Magnus!

Patch looks good. OK to push.

Just my few cents,
Mats Kindahl

msvensson@stripped wrote:
> Below is the list of changes that have just been committed into a local
> 5.0 repository of msvensson. When msvensson 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, 2007-09-26 17:04:41+02:00, msvensson@pilot.(none) +1 -0
>   Bug#31167 Introduction of @@hostname breaks replication in a ring
>    - Use a local uservariable to avoid @@hostname in binlog
>
>   scripts/mysql_system_tables_data.sql@stripped, 2007-09-26 17:04:39+02:00,
> msvensson@pilot.(none) +2 -1
>     Load @@hostname into a local user variable to avoid
>     writing @@hostname to the binary log that potentially
>     would be replicated to a slave server that not yet was upgraded
>     to have @@hostname.
>
> diff -Nrup a/scripts/mysql_system_tables_data.sql
> b/scripts/mysql_system_tables_data.sql
> --- a/scripts/mysql_system_tables_data.sql	2007-04-26 16:31:19 +02:00
> +++ b/scripts/mysql_system_tables_data.sql	2007-09-26 17:04:39 +02:00
> @@ -15,7 +15,8 @@ DROP TABLE tmp_db;
>  -- 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);
> +set @hostname= @@hostname;
> +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;
>
>   


-- 
Mats Kindahl
Lead Software Developer
Replication Team
MySQL AB, www.mysql.com