Advertisement
Guest User

fix for MDEV-364

a guest
Jul 31st, 2012
82
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.31 KB | None | 0 0
  1. === modified file 'sql/sql_table.cc'
  2. --- sql/sql_table.cc    2012-06-16 07:03:07 +0000
  3. +++ sql/sql_table.cc    2012-07-31 14:47:24 +0000
  4. @@ -201,7 +201,7 @@
  5.    int  part_name_len= 0;
  6.    const char *subpart_name= NULL;
  7.    int  subpart_name_len= 0;
  8. -  enum enum_file_name_type {NORMAL, TEMP, RENAMED} name_type= NORMAL;
  9. +  enum enum_file_name_type {NORMAL, TEMP, RENAMED, ALTER} name_type= NORMAL;
  10.    const char *tmp_p;
  11.    DBUG_ENTER("explain_filename");
  12.    DBUG_PRINT("enter", ("from '%s'", from));
  13. @@ -244,7 +244,7 @@
  14.                 (tmp_p[2] == 'L' || tmp_p[2] == 'l') &&
  15.                  tmp_p[3] == '-')
  16.        {
  17. -        name_type= TEMP;
  18. +        name_type= ALTER;
  19.          tmp_p+= 4; /* sql- prefix found */
  20.        }
  21.        else
  22. @@ -290,7 +290,7 @@
  23.        subpart_name_len= strlen(subpart_name);
  24.      else
  25.        part_name_len= strlen(part_name);
  26. -    if (name_type != NORMAL)
  27. +    if (name_type == TEMP || name_type == RENAMED)
  28.      {
  29.        if (subpart_name)
  30.          subpart_name_len-= 5;
  31. @@ -334,7 +334,7 @@
  32.        to_p= strnmov(to_p, ", ", end_p - to_p);
  33.      if (name_type != NORMAL)
  34.      {
  35. -      if (name_type == TEMP)
  36. +      if (name_type == TEMP || name_type == ALTER)
  37.          to_p= strnmov(to_p, ER_THD_OR_DEFAULT(thd, ER_TEMPORARY_NAME),
  38.                        end_p - to_p);
  39.        else
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement