diff options
author | unknown <monty@butch.> | 2002-11-07 12:49:01 +0200 |
---|---|---|
committer | unknown <monty@butch.> | 2002-11-07 12:49:01 +0200 |
commit | 8d0d518ceda975ba53f2cc94b01250f642ae6f11 (patch) | |
tree | 735a853cc51cb8bebe0ea3e7c79b1a381088f96d /innobase/include | |
parent | 4060f083076dcac09a37148d2f733b33fa825f2b (diff) | |
parent | c88b91020866b1505404157c76c56cbb92410ec5 (diff) | |
download | mariadb-git-8d0d518ceda975ba53f2cc94b01250f642ae6f11.tar.gz |
merge
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'innobase/include')
-rw-r--r-- | innobase/include/ut0ut.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/innobase/include/ut0ut.h b/innobase/include/ut0ut.h index 8ec23b23dcd..d4697c47266 100644 --- a/innobase/include/ut0ut.h +++ b/innobase/include/ut0ut.h @@ -10,6 +10,7 @@ Created 1/20/1994 Heikki Tuuri #define ut0ut_h #include "univ.i" +#include <string.h> #include <time.h> #ifndef MYSQL_SERVER #include <ctype.h> |