database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

hanged UDF interface to use clear() instead of reset()

Browse Source 
BUILD/FINISH.sh:
  Add just_clean option (for cleanup script)
scripts/mysql_fix_privilege_tables.sql:
  Added 'USE mysql' for easer use on windows
sql/item_sum.cc:
  Changed UDF interface to use clear() instead of reset()
sql/item_sum.h:
  Changed UDF interface to use clear() instead of reset()
sql/slave.cc:
  Fixed checking of eof for slave/master protocol. (Bug #887)
sql/sql_udf.cc:
  Changed UDF interface to use clear() instead of reset()
sql/sql_udf.h:
  Changed UDF interface to use clear() instead of reset()
sql/sql_yacc.yy:
  ERRORS and WARNINGS should not be reserved words
sql/udf_example.cc:
  Changed UDF interface to use clear() instead of reset()
This commit is contained in:
unknown
2003-08-27 22:30:50 +03:00
parent 91dc31d383
commit 0ee6f7fde0
10 changed files with 67 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/udf_example.cc
View File

@@ -149,6 +149,7 @@ longlong sequence(UDF_INIT *initid, UDF_ARGS *args, char *is_null,
my_bool avgcost_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
void avgcost_deinit( UDF_INIT* initid );
void avgcost_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
void avgcost_clear( UDF_INIT* initid, char* is_null, char *error );
void avgcost_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
double avgcost( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
}
@@ -902,21 +903,29 @@ avgcost_deinit( UDF_INIT* initid )
delete initid->ptr;
}
/* This is only for MySQL 4.0 compability */
void
avgcost_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message )
avgcost_reset(UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message)
{
avgcost_clear(initid, is_null, message);
avgcost_add(initid, args, is_null, message);
}
/* This is needed to get things to work in MySQL 4.1.1 and above */
void
avgcost_clear(UDF_INIT* initid, char* is_null, char* message)
{
struct avgcost_data* data = (struct avgcost_data*)initid->ptr;
data->totalprice = 0.0;
data->totalquantity = 0;
data->count = 0;
*is_null = 0;
avgcost_add( initid, args, is_null, message );
data->totalprice= 0.0;
data->totalquantity= 0;
data->count= 0;
}
void
avgcost_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message )
avgcost_add(UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message)
{
if (args->args[0] && args->args[1])
{