diff options
| author | monty@mashka.mysql.fi <> | 2003-05-26 19:03:25 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-05-26 19:03:25 +0300 |
| commit | bd4b9522e4a6b88550b4e1c8c41a24fc606bb9d4 (patch) | |
| tree | 87444df1f107f23458bb0baaea5766c26d542a4b /sql/field.h | |
| parent | 31d0d44919eebfc5f83fe82ae38312f13541144a (diff) | |
| parent | 68a159b1fadc932dbc13310a821efa2ebcb3e461 (diff) | |
| download | mariadb-git-bd4b9522e4a6b88550b4e1c8c41a24fc606bb9d4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/field.h b/sql/field.h index 3f3e32af285..4e468c7211b 100644 --- a/sql/field.h +++ b/sql/field.h @@ -213,8 +213,7 @@ public: virtual CHARSET_INFO *charset(void) const { return &my_charset_bin; } virtual bool has_charset(void) const { return FALSE; } virtual void set_charset(CHARSET_INFO *charset) { } - virtual void set_warning(const unsigned int level, - const unsigned int code); + void set_warning(const unsigned int level, const unsigned int code); friend bool reopen_table(THD *,struct st_table *,bool); friend int cre_myisam(my_string name, register TABLE *form, uint options, ulonglong auto_increment_value); |