diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-15 20:32:09 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-15 20:32:09 +0200 |
| commit | 3f742831211a4d53d97c5ac6ee402b4782de8776 (patch) | |
| tree | bf6f2bb43cd9c75eef36dd94166c76c6b9d402af /include | |
| parent | 5a8c6a33c22ed68acdccbde0649420cd8a80ad9d (diff) | |
| download | mariadb-git-3f742831211a4d53d97c5ac6ee402b4782de8776.tar.gz | |
basic row Items (SCRUM)
include/mysql_com.h:
basic row Items
include/mysqld_error.h:
more wide error mening
libmysqld/Makefile.am:
basic row Items
mysql-test/r/subselect.result:
more wide error mening
sql/Makefile.am:
basic row Items
sql/filesort.cc:
basic row Items
sql/item.cc:
basic row Items
sql/item.h:
basic row Items
sql/item_cmpfunc.cc:
basic row Items
sql/item_cmpfunc.h:
basic row Items
sql/item_func.cc:
basic row Items
sql/item_func.h:
basic row Items
sql/item_strfunc.cc:
basic row Items
sql/item_strfunc.h:
basic row Items
sql/item_subselect.cc:
basic row Items
sql/item_sum.cc:
basic row Items
sql/share/czech/errmsg.txt:
more wide error mening
sql/share/danish/errmsg.txt:
more wide error mening
sql/share/dutch/errmsg.txt:
more wide error mening
sql/share/english/errmsg.txt:
more wide error mening
sql/share/estonian/errmsg.txt:
more wide error mening
sql/share/french/errmsg.txt:
more wide error mening
sql/share/german/errmsg.txt:
more wide error mening
sql/share/greek/errmsg.txt:
more wide error mening
sql/share/hungarian/errmsg.txt:
more wide error mening
sql/share/italian/errmsg.txt:
more wide error mening
sql/share/japanese/errmsg.txt:
more wide error mening
sql/share/korean/errmsg.txt:
more wide error mening
sql/share/norwegian-ny/errmsg.txt:
more wide error mening
sql/share/norwegian/errmsg.txt:
more wide error mening
sql/share/polish/errmsg.txt:
more wide error mening
sql/share/portuguese/errmsg.txt:
more wide error mening
sql/share/romanian/errmsg.txt:
more wide error mening
sql/share/russian/errmsg.txt:
more wide error mening
sql/share/serbian/errmsg.txt:
more wide error mening
sql/share/slovak/errmsg.txt:
more wide error mening
sql/share/spanish/errmsg.txt:
more wide error mening
sql/share/swedish/errmsg.txt:
more wide error mening
sql/share/ukrainian/errmsg.txt:
more wide error mening
sql/sql_base.cc:
fix_fields error handling
sql/sql_lex.cc:
basic row Items
sql/sql_select.cc:
basic row Items
sql/sql_yacc.yy:
basic row Items
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 2 | ||||
| -rw-r--r-- | include/mysqld_error.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 5bf0394c7b0..b2295d16ecd 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -241,7 +241,7 @@ struct rand_struct { /* The following is for user defined functions */ -enum Item_result {STRING_RESULT,REAL_RESULT,INT_RESULT}; +enum Item_result {STRING_RESULT, REAL_RESULT, INT_RESULT, ROW_RESULT}; typedef struct st_udf_args { diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 456d675a045..687fca0adae 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -255,7 +255,7 @@ #define ER_MASTER_FATAL_ERROR_READING_BINLOG 1236 #define ER_WRONG_FK_DEF 1237 #define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1238 -#define ER_SUBSELECT_NO_1_COL 1239 +#define ER_CARDINALITY_COL 1239 #define ER_SUBSELECT_NO_1_ROW 1240 #define ER_UNKNOWN_STMT_HANDLER 1241 #define ER_CORRUPT_HELP_DB 1242 |