Commit b17ca5c7 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 

into  chilla.local:/home/mydev/mysql-5.1-bug26782


storage/myisam/mi_create.c:
  Auto merged
parents e3108256 54356b6f

storage/myisam/mi_create.c

+5 −3
Original line number Diff line number Diff line
@@ -603,10 +603,12 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
  }

  else

  {

    char *iext= strrchr(name, '.');

    int have_iext= iext && !strcmp(iext, MI_NAME_IEXT);

    fn_format(filename, name, "", MI_NAME_IEXT,

              (MY_UNPACK_FILENAME |

               (flags & HA_DONT_TOUCH_DATA) ? MY_RETURN_REAL_PATH : 0) |

                MY_APPEND_EXT);

              MY_UNPACK_FILENAME |

              ((flags & HA_DONT_TOUCH_DATA) ? MY_RETURN_REAL_PATH : 0) |

              (have_iext ? MY_REPLACE_EXT : MY_APPEND_EXT));

    linkname_ptr=0;

    /* Replace the current file */

    create_flag=MY_DELETE_OLD;