- update from ourdelta patches: sphinxsearch/sphinx_engine/sphinx.5.0.86.patch

[packages/mysql.git] / mysql-align.patch

diff --git a/mysql-align.patch b/mysql-align.patch
index 5feab48c0411f42ba214da8d63200a08c9d3292f..ac032a32036b5c05fa83f8c9b82cda0f721d1687 100644 (file)
--- a/mysql-align.patch
+++ b/mysql-align.patch
@@ -35,15 +35,15 @@
                       opts->u_max_value : value);
  
      if (!result_pos)
-@@ -738,7 +738,7 @@
-     value             Pointer to variable
+@@ -864,7 +864,7 @@
+     value              Pointer to variable
  */
  
--static void init_one_value(const struct my_option *option, gptr *variable,
-+static void init_one_value(const struct my_option *option, gptr variable,
+-static void init_one_value(const struct my_option *optp, gptr *variable,
++static void init_one_value(const struct my_option *optp, gptr variable,
                           longlong value)
  {
-   switch ((option->var_type & GET_TYPE_MASK)) {
+   DBUG_ENTER("init_one_value");
 @@ -793,12 +793,12 @@
        set the value to default value.
      */