diff options
| author | unknown <peter@mysql.com> | 2002-11-29 22:03:14 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-11-29 22:03:14 +0300 |
| commit | 14754ce141aa6a061a94fa668094b0602edd69c5 (patch) | |
| tree | 09b5a48a4fb2649410bee507206bcfc49ee4c806 /include/mysql_com.h | |
| parent | c1403e17a8a663fb9621d64bcb82602eb27a0716 (diff) | |
| parent | 1d418357ed693231066aeda713617b5e19e68a85 (diff) | |
| download | mariadb-git-14754ce141aa6a061a94fa668094b0602edd69c5.tar.gz | |
Merging....
BitKeeper/etc/logging_ok:
auto-union
client/insert_test.c:
Auto merged
client/select_test.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 68ea550c768..b8e78ee8f60 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -242,7 +242,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 { |