summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.h
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-05-10 10:49:50 +0200
committermsvensson@neptunus.(none) <>2005-05-10 10:49:50 +0200
commitf3890e94405c6700add76ab494be5f08914d18ff (patch)
tree2077399c26c84955527f934226af49301d7a30a9 /sql/item_strfunc.h
parent32024bfc4344d302d6b1ed22563c4dea637352a6 (diff)
parent689cb24b5b6c3f3959809d127b88ed249bbdc19e (diff)
downloadmariadb-git-f3890e94405c6700add76ab494be5f08914d18ff.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r--sql/item_strfunc.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index d7c77829cfc..4c44db49489 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -18,7 +18,6 @@
/* This file defines all string functions */
#ifdef USE_PRAGMA_INTERFACE
-#error PRAGMA
#pragma interface /* gcc class implementation */
#endif