← Back to branch summary

~ourdelta-core/ourdelta/ourdelta-percona-d6-mysql50

« back to all changes in this revision

Viewing changes to bakery/debian-5.0/patches/80_fix_user_setup_on_localhost.dpatch

  • Committer: Arjen Lentz
  • Date: 2008-10-23 12:36:56 UTC
  • mfrom: (30.2.14 ourdelta-cafuego)
  • Revision ID: arjen@openquery.com.au-20081023123656-82g0u0qb0uo3qrok
Get bakery (OurDelta build process) files into mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bakery/debian-5.0/patches/80_fix_user_setup_on_localhost.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 80_fix_user_setup_on_localhost.dpatch by Daniel Hahler <ubuntu@thequod.de>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: No description.
 
6
 
 
7
@DPATCH@
 
8
diff -Nur mysql-dfsg-5.0-5.0.67.orig/scripts/mysql_system_tables_data.sql mysql-dfsg-5.0-5.0.67/scripts/mysql_system_tables_data.sql
 
9
--- mysql-dfsg-5.0-5.0.67.orig/scripts/mysql_system_tables_data.sql     2008-08-04 14:20:02.000000000 +0200
 
10
+++ mysql-dfsg-5.0-5.0.67/scripts/mysql_system_tables_data.sql  2008-08-10 08:09:46.000000000 +0200
 
11
@@ -24,6 +24,6 @@
 
12
 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);
 
13
 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);
 
14
 INSERT INTO tmp_user (host,user) VALUES ('localhost','');
 
15
-INSERT INTO tmp_user (host,user) VALUES (@current_hostname,'');
 
16
+REPLACE INTO tmp_user (host,user) VALUES (@current_hostname,'');
 
17
 INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
 
18
 DROP TABLE tmp_user;