diff options
| author | unknown <bar@mysql.com> | 2005-08-29 15:44:49 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-08-29 15:44:49 +0500 |
| commit | 527a9cad7efab705503790c6e759bb33e3cca597 (patch) | |
| tree | 0365c0be8d68cb9bd70c0d40050c324a1771c1dd /sql/item.h | |
| parent | 8dd3a7d9a7cc9320478774ae8be0e66dfc73acb0 (diff) | |
| parent | c03d28b893af064364b0ae92971663801a136dc8 (diff) | |
| download | mariadb-git-527a9cad7efab705503790c6e759bb33e3cca597.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b12371
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 080b804c730..e683cda5786 100644 --- a/sql/item.h +++ b/sql/item.h @@ -618,6 +618,7 @@ public: basic_const_item returned TRUE. */ Item *new_item(); + Item *safe_charset_converter(CHARSET_INFO *tocs); /* Implement by-value equality evaluation if parameter value is set and is a basic constant (integer, real or string). |