database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merging

Browse Source 
mysql-test/r/func_str.result:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
This commit is contained in:
unknown
2004-07-21 19:10:37 +05:00
parent bf95f9195f 58bdba5785
commit c5fc0d433a
6 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysqld_error.h
View File

@ -317,4 +317,5 @@
#define ER_UNKNOWN_TIME_ZONE 1298
#define ER_WARN_INVALID_TIMESTAMP 1299
#define ER_INVALID_CHARACTER_STRING 1300
#define ER_ERROR_MESSAGES 301
#define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301
#define ER_ERROR_MESSAGES 302