summaryrefslogtreecommitdiff
path: root/mysys/my_dup.c
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-06-07 12:05:42 +0200
committerunknown <msvensson@neptunus.(none)>2006-06-07 12:05:42 +0200
commitd08822b3116f1957d14de1aa64360d918e3082fe (patch)
tree938c149ca1ae61a9f95e995463c6d1817634b72f /mysys/my_dup.c
parentba0a96511dc473f06f69ca9fdc5d73c50b869a95 (diff)
parent01e1b8373e5f6322283ac2ccc0682938834c7454 (diff)
downloadmariadb-git-d08822b3116f1957d14de1aa64360d918e3082fe.tar.gz
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
Diffstat (limited to 'mysys/my_dup.c')
-rw-r--r--mysys/my_dup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/my_dup.c b/mysys/my_dup.c
index f4c420eb459..55f22931cd4 100644
--- a/mysys/my_dup.c
+++ b/mysys/my_dup.c
@@ -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 "mysys_err.h"
#include <my_dir.h>