diff options
| author | unknown <konstantin@mysql.com> | 2006-04-23 04:04:36 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-04-23 04:04:36 +0400 |
| commit | 38c4f0b7692611e9eabbe9d91f576410f0ee98dd (patch) | |
| tree | cf86208cb9610e10d0c11805be4ec6bd4a8d4093 /sql/item.h | |
| parent | a0aea60d0e3ea05b8e4d9f58e6ad1d98203eb175 (diff) | |
| parent | 7069599748259e59353bce21e8b5ae7cd4b8ff44 (diff) | |
| download | mariadb-git-38c4f0b7692611e9eabbe9d91f576410f0ee98dd.tar.gz | |
Merge mysql.com:/opt/local/work/tmp_merge
into mysql.com:/opt/local/work/mysql-5.1-merge
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/item.h b/sql/item.h index 6c7a0976df1..ffa3e09fc6e 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1431,18 +1431,6 @@ public: }; -class Item_static_int_func :public Item_int -{ - const char *func_name; -public: - Item_static_int_func(const char *str_arg, longlong i, uint length) - :Item_int(NullS, i, length), func_name(str_arg) - {} - Item *safe_charset_converter(CHARSET_INFO *tocs); - void print(String *str) { str->append(func_name); } -}; - - class Item_uint :public Item_int { public: |