diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
| commit | 567671368723c704d60902b4d0ccff951b414552 (patch) | |
| tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /sql/item_func.h | |
| parent | efee0608316e4cc034a3e62d05980eef8530843d (diff) | |
| parent | ceefe7bb50b17b72e88851e3b98642e89a4cddae (diff) | |
| download | mariadb-git-567671368723c704d60902b4d0ccff951b414552.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 1aae0a5abb5..f22bc0c301c 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1,3 +1,6 @@ +#ifndef ITEM_FUNC_INCLUDED +#define ITEM_FUNC_INCLUDED + /* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify @@ -1706,3 +1709,4 @@ public: bool check_partition_func_processor(uchar *int_arg) {return FALSE;} }; +#endif /* ITEM_FUNC_INCLUDED */ |