diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-16 13:19:01 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-16 13:19:01 +0500 |
| commit | 1c0be008400f4c0b1996623cffc82e67afb760cc (patch) | |
| tree | 1be6661e0b402cfbe41f506836d9a4534381ed33 /sql/item.h | |
| parent | fae5f5321e42fc0dbdab091aa59c636460c15be6 (diff) | |
| parent | 2024dedb94da850966ea4231c281505ecf37090e (diff) | |
| download | mariadb-git-1c0be008400f4c0b1996623cffc82e67afb760cc.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
sql/item.cc:
Auto merged
sql/item.h:
manual merge
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index f4f3753d655..913dca50bff 100644 --- a/sql/item.h +++ b/sql/item.h @@ -872,7 +872,7 @@ public: bool is_datetime(); virtual Field::geometry_type get_geometry_type() const { return Field::GEOM_GEOMETRY; }; - String *check_well_formed_result(String *str); + String *check_well_formed_result(String *str, bool send_error= 0); }; |