OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   18-Apr-2005 16:45:48
  Branch: OPENPKG_2_2_SOLID                Handle: 2005041815454800

  Modified files:           (Branch: OPENPKG_2_2_SOLID)
    openpkg-src/mysql       mysql.patch

  Log:
    correct faulty scope logic in patch file

  Summary:
    Revision    Changes     Path
    1.7.4.2     +8  -9      openpkg-src/mysql/mysql.patch
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql/mysql.patch
  ============================================================================
  $ cvs diff -u -r1.7.4.1 -r1.7.4.2 mysql.patch
  --- openpkg-src/mysql/mysql.patch     15 Apr 2005 11:45:18 -0000      1.7.4.1
  +++ openpkg-src/mysql/mysql.patch     18 Apr 2005 14:45:48 -0000      1.7.4.2
  @@ -221,7 +221,7 @@
    }
    
    extern "C" byte* get_hash_key(const byte *buff,uint *length,
  -@@ -186,13 +208,14 @@
  +@@ -186,13 +208,13 @@
          new_dl=1;
        }
        tmp->dlhandle = dl;
  @@ -232,14 +232,13 @@
   -      del_udf(tmp);
   -      if (new_dl)
   -    dlclose(dl);
  -+      char buf[MAX_FIELD_NAME+16], *missing;
  -+      if ((missing=init_syms(tmp, buf)))
  -+      {
  -+        sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), missing);
  -+        del_udf(tmp);
  -+        if (new_dl)
  -+          dlclose(dl);
  -+      }
  ++    char buf[MAX_FIELD_NAME+16], *missing;
  ++    if ((missing=init_syms(tmp, buf)))
  ++    {
  ++      sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), missing);
  ++      del_udf(tmp);
  ++      if (new_dl)
  ++        dlclose(dl);
        }
      }
      if (error > 0)
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to