diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-06-10 20:33:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-06-10 20:33:50 +0200 |
| commit | d889c1a8bdaafa69787ea6cd300cb01dce61d8e0 (patch) | |
| tree | a19132f98ae7c58aa6233f7efa53dcbe6b4d2cdc /mysys/my_lib.c | |
| parent | 9f9d7e0ae23e47b74b8d635ec0f1f7d1496d06b8 (diff) | |
| parent | d7b474e1e673b120d8aebc295f29a7dbd215b79c (diff) | |
| download | mariadb-git-d889c1a8bdaafa69787ea6cd300cb01dce61d8e0.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BUILD/compile-dist:
Auto merged
client/mysqltest.c:
Auto merged
config/ac-macros/ssl.m4:
Auto merged
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/group_min_max.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/rpl_insert_id_pk.result:
Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/r/rpl_ndb_sp006.result:
Auto merged
mysql-test/t/sp.test:
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
mysql-test/r/create.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/r/join_outer.result:
Manual merge
mysql-test/t/func_group.test:
Manual merge
mysql-test/t/group_min_max.test:
Manual merge
mysql-test/t/innodb_mysql.test:
Manual merge
Diffstat (limited to 'mysys/my_lib.c')
| -rw-r--r-- | mysys/my_lib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/my_lib.c b/mysys/my_lib.c index 42c57e9d3c4..4ed44b0573f 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.c @@ -17,7 +17,6 @@ /* TODO: check for overun of memory for names. */ /* Convert MSDOS-TIME to standar time_t (still needed?) */ -#define USES_TYPES /* sys/types is included */ #include "mysys_priv.h" #include <m_string.h> #include <my_dir.h> /* Structs used by my_dir,includes sys/types */ |