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 
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
This commit is contained in:
unknown
2002-11-29 22:03:14 +03:00
parent c1403e17a8 1d418357ed
commit 14754ce141
210 changed files with 18620 additions and 8283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql_com.h
View File

@ -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
{