database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-18 23:03:28 +03:00
Code Activity

Resolve merge colflict

Browse Source 
mysql-test/r/create.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
include/mysqld_error.h:
  Resolve merge colflict by changing the warning codes
This commit is contained in:
unknown
2003-05-21 00:12:09 -07:00
parent 61fd4d561d c121cb748d
commit a8e5dcb449
132 changed files with 1238 additions and 39342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/mysqld_error.h
View File

@ -280,5 +280,6 @@
#define ER_WARN_NULL_TO_NOTNULL 1261
#define ER_WARN_DATA_OUT_OF_RANGE 1262
#define ER_WARN_DATA_TRUNCATED 1263
#define ER_ERROR_MESSAGES 264
#define ER_WARN_USING_OTHER_HANDLER 1264
#define ER_CANT_AGGREGATE_COLLATIONS 1265
#define ER_ERROR_MESSAGES 266