diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-21 21:28:51 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-21 21:28:51 +0200 |
| commit | 8823fa22f16acca6e540074fdcd2491183a38707 (patch) | |
| tree | 746b47095ebdcc9cd407758fe0edc8f9e2495e33 /sql/mf_iocache.cc | |
| parent | 1291f7798dbf2f711c2b7c85e785cf46d942fc8f (diff) | |
| parent | 5d5b1fee0211ccd8b234f917075af6d82899e9d2 (diff) | |
| download | mariadb-git-8823fa22f16acca6e540074fdcd2491183a38707.tar.gz | |
Merge
client/mysql.cc:
Auto merged
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mf_iocache.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/protocol.cc:
SCCS merged
Diffstat (limited to 'sql/mf_iocache.cc')
| -rw-r--r-- | sql/mf_iocache.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc index e7e72617c83..4b0575c8579 100644 --- a/sql/mf_iocache.cc +++ b/sql/mf_iocache.cc @@ -38,7 +38,6 @@ #include <errno.h> static void my_aiowait(my_aio_result *result); #endif -#include <assert.h> extern "C" { |