~ourdelta-developers/ourdelta/ourdelta-delayed-slave-replication

« back to all changes in this revision

Viewing changes to mysql/5.0/erik_ljungstrom/mysqld_safe_fixlp290190_fixmysql40368/mysqld_safe_fixlp290190_fixmysql40368.patch

  • Committer: Arjen Lentz
  • Date: 2008-11-03 12:53:42 UTC
  • mfrom: (35.1.3 ourdelta-erik)
  • Revision ID: arjen@openquery.com.au-20081103125342-o5aigwai6i64u450
Merged in Erik's branch for fixing up mysqld_safe bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Index: mysql-5.0.67/scripts/mysqld_safe.sh
 
2
===================================================================
 
3
--- mysql-5.0.67.orig/scripts/mysqld_safe.sh    2008-08-04 13:20:02.000000000 +0100
 
4
+++ mysql-5.0.67/scripts/mysqld_safe.sh 2008-10-28 22:11:06.000000000 +0000
 
5
@@ -59,6 +59,14 @@
 
6
   fi
 
7
 
 
8
   for arg do
 
9
+
 
10
+    # Replaces all underscores with dashes (excluding the two initial ones
 
11
+    # and any instances after the first = character) since mysqld accepts
 
12
+    # variables in this format.
 
13
+    substr_a=`echo $arg | sed -e 's/\(...\)\(.*\)=\(.*\)/\2/'`
 
14
+    substr_b=`echo $substr_a | sed s/_/-/g`
 
15
+    arg=`echo $arg | sed s/$substr_a/$substr_b/g`
 
16
+
 
17
     case "$arg" in
 
18
       --skip-kill-mysqld*)
 
19
         KILL_MYSQLD=0;
 
20
Index: mysql-5.0.67/patch_info/mysqld_safe_fixlp290190_fixmysql40368.info
 
21
===================================================================
 
22
--- /dev/null   2008-10-17 18:51:21.426369000 +0100
 
23
+++ mysql-5.0.67/patch_info//mysqld_safe_fixlp290190_fixmysql40368.info       2008-10-28 23:14:16.000000000 +0000
 
24
@@ -0,0 +1,6 @@
 
25
+File=mysqld_safe_fixlp290190_fixmysql40368.patch
 
26
+Name=mysqld_safe_fix
 
27
+Version=1.1
 
28
+Author=Erik Ljungstrom
 
29
+License=GPL
 
30
+Comment=Fixes bugs lp:290190 mysql:40368