diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-03 14:04:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 17:51:50 +0200 |
| commit | ece01ef3dc89d20198efbaec40e7114fdb515338 (patch) | |
| tree | 7f3c1f1ee812b8bf8fa98fee94103dae4d7afa0d /include | |
| parent | 12067633fb44205777e2e9f401bbcb3242bafd66 (diff) | |
| download | mariadb-git-ece01ef3dc89d20198efbaec40e7114fdb515338.tar.gz | |
After-review changes
* remove redundant code
* fix tests
* move declarations and defines where they belong
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_time.h | 4 | ||||
| -rw-r--r-- | include/sql_common.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/my_time.h b/include/my_time.h index a5fe7858797..8dc1f09ba0f 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -171,6 +171,10 @@ static inline my_bool validate_timestamp_range(const MYSQL_TIME *t) return TRUE; } +/* Can't include mysqld_error.h, it needs mysys to build, thus hardcode 2 error values here. */ +#define ER_WARN_DATA_OUT_OF_RANGE 1264 +#define ER_WARN_INVALID_TIMESTAMP 1299 + my_time_t my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, uint *error_code); diff --git a/include/sql_common.h b/include/sql_common.h index 6fdef6fef2b..49616f6d56c 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -113,7 +113,9 @@ void set_mysql_extended_error(MYSQL *mysql, int errcode, const char *sqlstate, const char *format, ...); /* client side of the pluggable authentication */ +struct st_vio; struct st_plugin_vio_info; +void mpvio_info(struct st_vio *vio, struct st_plugin_vio_info *info); int run_plugin_auth(MYSQL *mysql, char *data, uint data_len, const char *data_plugin, const char *db); int mysql_client_plugin_init(); |