1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge neptunus.(none):/home/msvensson/mysql/my51-bug15936

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
sql/unireg.cc:
  Auto merged
This commit is contained in:
unknown
2006-06-07 12:05:42 +02:00
13 changed files with 0 additions and 22 deletions

View File

@ -14,7 +14,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#define USES_TYPES
#include "mysys_priv.h"
#include <my_dir.h>
#include "mysys_err.h"