diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-05-26 19:01:20 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-05-26 19:01:20 +0300 |
| commit | 5d3eec14dd3e8b2e4656e5559114650bee54a5e6 (patch) | |
| tree | 8384ed6e6835d6903702a8f44da157d99f0ff97c /sql/field.h | |
| parent | 3565727359aaea5f2fab3740d71d36fb9015f77a (diff) | |
| download | mariadb-git-5d3eec14dd3e8b2e4656e5559114650bee54a5e6.tar.gz | |
New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set
Docs/internals.texi:
Updated protocol information
include/mysql.h:
Added catalog to MYSQL_FIELD
Added sqlstate handling to protocol
include/mysql_com.h:
New 4.1 protocol
libmysql/libmysql.c:
Added sqlstate handling
Added CLIENT_MULTI_RESULTS
sql/field.cc:
Indentation cleanup
sql/field.h:
Indentation cleanup
sql/mysql_priv.h:
Changed arguments to close_connection()
sql/mysqld.cc:
Changed arguments to close_connection()
Added checking of extra arguments to mysqld
sql/protocol.cc:
Fixed bug in TIME handling
Added SQLSTATE on errors
Removed net_send_error()
sql/protocol.h:
Removed net_send_error()
sql/repl_failsafe.cc:
Fixed arguments to close_connection()
sql/sql_parse.cc:
New 4.1 protocol
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 cf08b1a9717..f16af9cfe0f 100644 --- a/sql/field.h +++ b/sql/field.h @@ -212,8 +212,7 @@ public: virtual bool get_time(TIME *ltime); virtual CHARSET_INFO *charset(void) const { return &my_charset_bin; } 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); |