summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorkaa@kaamos.(none) <>2008-02-13 12:12:00 +0300
committerkaa@kaamos.(none) <>2008-02-13 12:12:00 +0300
commit9f194149b85c38744670decd4e859b8574f4335b (patch)
tree32093b4d9c9eff7578d39bb14fee8bbbdcf1dc4b /sql/item.h
parenta44413741a3e1195b92ea10e394a7d2e60079fd3 (diff)
parent1a67148ccdcfe894b23e1fa022e2f246864b68df (diff)
downloadmariadb-git-9f194149b85c38744670decd4e859b8574f4335b.tar.gz
Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into kaamos.(none):/data/src/opt/mysql-5.1-opt
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index b98389bc8d4..a4b23072e01 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1004,6 +1004,7 @@ public:
virtual Field::geometry_type get_geometry_type() const
{ return Field::GEOM_GEOMETRY; };
String *check_well_formed_result(String *str, bool send_error= 0);
+ bool eq_by_collation(Item *item, bool binary_cmp, CHARSET_INFO *cs);
};