diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_time.h | 10 | ||||
| -rw-r--r-- | include/mysql_com.h | 1 | ||||
| -rw-r--r-- | include/mysqld_error.h | 5 | ||||
| -rw-r--r-- | include/sql_state.h | 6 |
4 files changed, 17 insertions, 5 deletions
diff --git a/include/my_time.h b/include/my_time.h index d4dbe459c3b..332b26a15eb 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -41,8 +41,13 @@ typedef long my_time_t; #define YY_PART_YEAR 70 /* Flags to str_to_datetime */ -#define TIME_FUZZY_DATE 1 -#define TIME_DATETIME_ONLY 2 +#define TIME_FUZZY_DATE 1 +#define TIME_DATETIME_ONLY 2 +/* Must be same as MODE_NO_ZERO_IN_DATE */ +#define TIME_NO_ZERO_IN_DATE (65536L*2*2*2*2*2*2*2) +/* Must be same as MODE_NO_ZERO_DATE */ +#define TIME_NO_ZERO_DATE (TIME_NO_ZERO_IN_DATE*2) +#define TIME_INVALID_DATES (TIME_NO_ZERO_DATE*2) enum enum_mysql_timestamp_type str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, @@ -52,6 +57,7 @@ bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time, int *was_cut); long calc_daynr(uint year,uint month,uint day); +uint calc_days_in_year(uint year); void init_time(void); diff --git a/include/mysql_com.h b/include/mysql_com.h index 3cf1a011e3c..16a1581a6c9 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -79,6 +79,7 @@ enum enum_server_command #define AUTO_INCREMENT_FLAG 512 /* field is a autoincrement field */ #define TIMESTAMP_FLAG 1024 /* Field is a timestamp */ #define SET_FLAG 2048 /* field is a set */ +#define NO_DEFAULT_VALUE_FLAG 4096 /* Field doesn't have default value */ #define NUM_FLAG 32768 /* Field is num (for clients) */ #define PART_KEY_FLAG 16384 /* Intern; Part of some key */ #define GROUP_FLAG 32768 /* Intern: Group field */ diff --git a/include/mysqld_error.h b/include/mysqld_error.h index cf032380e2f..36dd4d00ef2 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -380,4 +380,7 @@ #define ER_TRG_ON_VIEW_OR_TEMP_TABLE 1361 #define ER_TRG_CANT_CHANGE_ROW 1362 #define ER_TRG_NO_SUCH_ROW_IN_TRG 1363 -#define ER_ERROR_MESSAGES 364 +#define ER_NO_DEFAULT_FOR_FIELD 1364 +#define ER_DIVISION_BY_ZERO 1365 +#define ER_TRUNCATED_WRONG_VALUE_FOR_FIELD 1366 +#define ER_ERROR_MESSAGES 367 diff --git a/include/sql_state.h b/include/sql_state.h index 7bf05203463..0b31fc07933 100644 --- a/include/sql_state.h +++ b/include/sql_state.h @@ -92,7 +92,7 @@ ER_PASSWORD_ANONYMOUS_USER, "42000", "", ER_PASSWORD_NOT_ALLOWED, "42000", "", ER_PASSWORD_NO_MATCH, "42000", "", ER_WRONG_VALUE_COUNT_ON_ROW, "21S01", "", -ER_INVALID_USE_OF_NULL, "42000", "", +ER_INVALID_USE_OF_NULL, "22004", "", ER_REGEXP_ERROR, "42000", "", ER_MIX_OF_GROUP_FUNC_AND_FIELDS,"42000", "", ER_NONEXISTING_GRANT, "42000", "", @@ -157,11 +157,12 @@ ER_COLLATION_CHARSET_MISMATCH, "42000", "", ER_WARN_TOO_FEW_RECORDS, "01000", "", ER_WARN_TOO_MANY_RECORDS, "01000", "", ER_WARN_NULL_TO_NOTNULL, "01000", "", -ER_WARN_DATA_OUT_OF_RANGE, "01000", "", +ER_WARN_DATA_OUT_OF_RANGE, "22003", "", ER_WARN_DATA_TRUNCATED, "01000", "", ER_WRONG_NAME_FOR_INDEX, "42000", "", ER_WRONG_NAME_FOR_CATALOG, "42000", "", ER_UNKNOWN_STORAGE_ENGINE, "42000", "", +ER_TRUNCATED_WRONG_VALUE, "22007", "", /* 5.0 */ ER_SP_NO_RECURSIVE_CREATE, "2F003", "", ER_SP_ALREADY_EXISTS, "42000", "", @@ -200,3 +201,4 @@ ER_SP_NO_USE, "42000", "", ER_SP_VARCOND_AFTER_CURSHNDLR, "42000", "", ER_SP_CURSOR_AFTER_HANDLER, "42000", "", ER_SP_CASE_NOT_FOUND, "20000", "", +ER_DIVISION_BY_ZERO, "22012", "", |