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

merge

Browse Source 
Docs/manual.texi:
  Auto merged
extra/perror.c:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql.h:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
This commit is contained in:
unknown
2001-09-17 23:26:00 +02:00
parent 9f939ecce6 9d62e4a05b
commit d8ae9669cd
38 changed files with 494 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/mysqld_error.h
View File

@ -213,11 +213,12 @@
#define ER_WRONG_ARGUMENTS 1210
#define ER_NO_PERMISSION_TO_CREATE_USER 1211
#define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212
#define ER_CONNECT_TO_MASTER 1213
#define ER_QUERY_ON_MASTER 1214
#define ER_ERROR_WHEN_EXECUTING_COMMAND 1215
#define ER_WRONG_USAGE 1216
#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1217
#define ER_CANT_UPDATE_WITH_READLOCK 1218
#define ER_MIXING_NOT_ALLOWED 1219
#define ER_ERROR_MESSAGES 220
#define ER_LOCK_DEADLOCK 1213
#define ER_CONNECT_TO_MASTER 1214
#define ER_QUERY_ON_MASTER 1215
#define ER_ERROR_WHEN_EXECUTING_COMMAND 1216
#define ER_WRONG_USAGE 1217
#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1218
#define ER_CANT_UPDATE_WITH_READLOCK 1219
#define ER_MIXING_NOT_ALLOWED 1220
#define ER_ERROR_MESSAGES 221