diff options
| author | unknown <kent@mysql.com> | 2005-06-02 02:57:18 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-06-02 02:57:18 +0200 |
| commit | e71ef9416f84922310f88c1cd7295334dadfeb68 (patch) | |
| tree | 11e854a5c872762d333b583afd7b3b4bbeae11b1 /sql/sql_string.cc | |
| parent | 638bb0a2917b966f136f0046234fc40b9407df29 (diff) | |
| parent | cee10f979e3bf4a26dca94bd94002b316e400733 (diff) | |
| download | mariadb-git-e71ef9416f84922310f88c1cd7295334dadfeb68.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index ab2db4aaf53..e5339782f02 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -16,11 +16,12 @@ /* This file is originally from the mysql distribution. Coded by monty */ +#include <my_global.h> + #ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif -#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include <m_ctype.h> |