SOURCES (MYSQL_5_0): mysql.init - merge from AC-branch

[glen]

Author: glen                         Date: Fri Jun  8 11:11:34 2007 GMT
Module: SOURCES                       Tag: MYSQL_5_0
---- Log message:
- merge from AC-branch

---- Files affected:
SOURCES:
   mysql.init (1.105.4.1.2.2 -> 1.105.4.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.105.4.1.2.2 SOURCES/mysql.init:1.105.4.1.2.3
--- SOURCES/mysql.init:1.105.4.1.2.2    Tue May 29 00:34:34 2007
+++ SOURCES/mysql.init  Fri Jun  8 13:11:28 2007
@@ -503,10 +503,13 @@
 
 
          i_u="INSERT INTO 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','','','','',0,0,0,0);
-         INSERT INTO user VALUES ('$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','','','','',0,0,0,0);
          INSERT INTO user (host,user) values ('localhost','');
-         INSERT INTO user (host,user) values ('$hostname','');
          INSERT INTO user VALUES 
('localhost','mysql_logrotate','','N','N','N','N','N','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);"
+         if [ ! "x$hostname" -eq "xlocahost" ]; then
+                 i_u="
+                 INSERT INTO user VALUES ('$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','','','','',0,0,0,0);
+                 INSERT INTO user (host,user) values ('$hostname','');";
+         fi;
        fi
 
        if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/func.frm
@@ -770,7 +773,8 @@
        fi
 
        if /usr/sbin/mysqld --bootstrap --skip-grant-tables \
-           --datadir=$MYSQL_DATA_DIR --user=$MYSQL_USER 2>> /var/log/mysql/err 
<< END_OF_DATA
+           --datadir=$MYSQL_DATA_DIR --user=$MYSQL_USER 
--slave-load-tmpdir=$MYSQL_DATA_DIR \
+               --tmpdir=$MYSQL_DATA_DIR 2>> /var/log/mysql/err << END_OF_DATA
 CREATE DATABASE mysql;
 use mysql;
 $c_d
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/SOURCES/mysql.init?r1=1.105.4.1.2.2&r2=1.105.4.1.2.3&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit