Skip to content

M
mariadb
Commit 4b85d31b authored by unknown's avatar unknown
Browse files
Options

Merge mysql.com:/home/pz/mysql/mysql-4.1-root 

into mysql.com:/home/pz/mysql/mysql-4.1


include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
parents 5b1ced45 4587ddda
Show whitespace changes
Inline Side-by-side
Showing with 1245 additions and 974 deletions
include/mysql.h
View file @ 4b85d31b
...@@ -57,6 +57,9 @@ typedef int my_socket; ...@@ -57,6 +57,9 @@ typedef int my_socket;
#include "mysql_com.h" #include "mysql_com.h"
#include "mysql_version.h" #include "mysql_version.h"
#include "typelib.h" #include "typelib.h"
#ifndef DBUG_OFF
#define CHECK_EXTRA_ARGUMENTS
#endif
extern unsigned int mysql_port; extern unsigned int mysql_port;
extern char *mysql_unix_port; extern char *mysql_unix_port;
...@@ -424,7 +427,7 @@ int STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con, ...@@ -424,7 +427,7 @@ int STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con,
*/ */
/* statement state */ /* statement state */
enum MY_STMT_STATE { MY_ST_UNKNOWN, MY_ST_PREPARE, MY_ST_EXECUTE }; enum PREP_STMT_STATE { MY_ST_UNKNOWN, MY_ST_PREPARE, MY_ST_EXECUTE };
/* bind structure */ /* bind structure */
typedef struct st_mysql_bind typedef struct st_mysql_bind
...@@ -442,7 +445,7 @@ typedef struct st_mysql_bind ...@@ -442,7 +445,7 @@ typedef struct st_mysql_bind
my_bool long_ended; /* All data supplied for long */ my_bool long_ended; /* All data supplied for long */
unsigned int param_number; /* For null count and error messages */ unsigned int param_number; /* For null count and error messages */
void (*store_param_func)(NET *net, struct st_mysql_bind *param); void (*store_param_func)(NET *net, struct st_mysql_bind *param);
char *(*fetch_result)(struct st_mysql_bind *, const char *row); void (*fetch_result)(struct st_mysql_bind *, unsigned char **row);
} MYSQL_BIND; } MYSQL_BIND;
...@@ -462,10 +465,12 @@ typedef struct st_mysql_stmt ...@@ -462,10 +465,12 @@ typedef struct st_mysql_stmt
unsigned long long_length; /* long buffer alloced length */ unsigned long long_length; /* long buffer alloced length */
unsigned long stmt_id; /* Id for prepared statement */ unsigned long stmt_id; /* Id for prepared statement */
unsigned int last_errno; /* error code */ unsigned int last_errno; /* error code */
enum MY_STMT_STATE state; /* statement state */ enum PREP_STMT_STATE state; /* statement state */
char last_error[MYSQL_ERRMSG_SIZE]; /* error message */ char last_error[MYSQL_ERRMSG_SIZE]; /* error message */
my_bool long_alloced; /* flag to indicate long alloced */ my_bool long_alloced; /* flag to indicate long alloced */
my_bool types_supplied; /* to indicate types supply */ my_bool send_types_to_server; /* to indicate types supply to server */
my_bool param_buffers; /* to indicate the param bound buffers */
my_bool res_buffers; /* to indicate the result bound buffers */
} MYSQL_STMT; } MYSQL_STMT;
......
include/mysql_com.h
View file @ 4b85d31b
...@@ -312,6 +312,7 @@ void my_thread_end(void); ...@@ -312,6 +312,7 @@ void my_thread_end(void);
#endif #endif
#define NULL_LENGTH ((unsigned long) ~0) /* For net_store_length */ #define NULL_LENGTH ((unsigned long) ~0) /* For net_store_length */
#define MYSQL_STMT_HEADER 4
#define MYSQL_LONG_DATA_HEADER 8 #define MYSQL_LONG_DATA_HEADER 8
#endif #endif
include/mysqld_error.h
View file @ 4b85d31b
...@@ -261,4 +261,5 @@ ...@@ -261,4 +261,5 @@
#define ER_CORRUPT_HELP_DB 1242 #define ER_CORRUPT_HELP_DB 1242
#define ER_CYCLIC_REFERENCE 1243 #define ER_CYCLIC_REFERENCE 1243
#define ER_AUTO_CONVERT 1244 #define ER_AUTO_CONVERT 1244
#define ER_ERROR_MESSAGES 245 #define ER_ILLEGAL_REFERENCE 1245
#define ER_ERROR_MESSAGES 246
libmysql/errmsg.c
View file @ 4b85d31b
...@@ -59,7 +59,7 @@ const char *client_errors[]= ...@@ -59,7 +59,7 @@ const char *client_errors[]=
"No parameters exists in the statement", "No parameters exists in the statement",
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non string or binary data types (parameter: %d)", "Can't send long data for non string or binary data types (parameter: %d)",
"Using not supported parameter type: %d (parameter: %d)" "Using un supported parameter type: %d (parameter: %d)"
"Shared memory (%lu)", "Shared memory (%lu)",
"Can't open shared memory. Request event don't create (%lu)", "Can't open shared memory. Request event don't create (%lu)",
"Can't open shared memory. Answer event don't create (%lu)", "Can't open shared memory. Answer event don't create (%lu)",
...@@ -113,7 +113,7 @@ const char *client_errors[]= ...@@ -113,7 +113,7 @@ const char *client_errors[]=
"No parameters exists in the statement", "No parameters exists in the statement",
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non string or binary data types (parameter: %d)", "Can't send long data for non string or binary data types (parameter: %d)",
"Using not supported parameter type: %d (parameter: %d)" "Using un supported parameter type: %d (parameter: %d)"
"Shared memory (%lu)", "Shared memory (%lu)",
"Can't open shared memory. Request event don't create (%lu)", "Can't open shared memory. Request event don't create (%lu)",
"Can't open shared memory. Answer event don't create (%lu)", "Can't open shared memory. Answer event don't create (%lu)",
...@@ -165,7 +165,7 @@ const char *client_errors[]= ...@@ -165,7 +165,7 @@ const char *client_errors[]=
"No parameters exists in the statement", "No parameters exists in the statement",
"Invalid parameter number", "Invalid parameter number",
"Can't send long data for non string or binary data types (parameter: %d)", "Can't send long data for non string or binary data types (parameter: %d)",
"Using not supported parameter type: %d (parameter: %d)" "Using un supported parameter type: %d (parameter: %d)"
"Shared memory (%lu)", "Shared memory (%lu)",
"Can't open shared memory. Request event don't create (%lu)", "Can't open shared memory. Request event don't create (%lu)",
"Can't open shared memory. Answer event don't create (%lu)", "Can't open shared memory. Answer event don't create (%lu)",
......
libmysql/libmysql.c
View file @ 4b85d31b
...@@ -1740,7 +1740,7 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , ...@@ -1740,7 +1740,7 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) ,
static void static void
mysql_ssl_free(MYSQL *mysql __attribute__((unused))) mysql_ssl_free(MYSQL *mysql __attribute__((unused)))
{ {
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSLL
my_free(mysql->options.ssl_key, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.ssl_key, MYF(MY_ALLOW_ZERO_PTR));
my_free(mysql->options.ssl_cert, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.ssl_cert, MYF(MY_ALLOW_ZERO_PTR));
my_free(mysql->options.ssl_ca, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.ssl_ca, MYF(MY_ALLOW_ZERO_PTR));
...@@ -1754,7 +1754,7 @@ mysql_ssl_free(MYSQL *mysql __attribute__((unused))) ...@@ -1754,7 +1754,7 @@ mysql_ssl_free(MYSQL *mysql __attribute__((unused)))
mysql->options.ssl_cipher= 0; mysql->options.ssl_cipher= 0;
mysql->options.use_ssl = FALSE; mysql->options.use_ssl = FALSE;
mysql->connector_fd = 0; mysql->connector_fd = 0;
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSLL */
} }
/************************************************************************** /**************************************************************************
...@@ -2645,7 +2645,7 @@ get_info: ...@@ -2645,7 +2645,7 @@ get_info:
{ {
mysql->affected_rows= net_field_length_ll(&pos); mysql->affected_rows= net_field_length_ll(&pos);
mysql->insert_id= net_field_length_ll(&pos); mysql->insert_id= net_field_length_ll(&pos);
if (mysql->server_capabilities & CLIENT_PROTOCOL_41) if (protocol_41(mysql))
{ {
mysql->server_status=uint2korr(pos); pos+=2; mysql->server_status=uint2korr(pos); pos+=2;
mysql->warning_count=uint2korr(pos); pos+=2; mysql->warning_count=uint2korr(pos); pos+=2;
...@@ -3728,10 +3728,10 @@ MYSQL_STMT *STDCALL ...@@ -3728,10 +3728,10 @@ MYSQL_STMT *STDCALL
mysql_prepare(MYSQL *mysql, const char *query, ulong length) mysql_prepare(MYSQL *mysql, const char *query, ulong length)
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
DBUG_ENTER("mysql_real_prepare"); DBUG_ENTER("mysql_prepare");
DBUG_ASSERT(mysql != 0); DBUG_ASSERT(mysql != 0);
#ifdef EXTRA_CHECK_ARGUMENTS #ifdef CHECK_EXTRA_ARGUMENTS
if (!query) if (!query)
{ {
set_mysql_error(mysql, CR_NULL_POINTER); set_mysql_error(mysql, CR_NULL_POINTER);
...@@ -3752,7 +3752,6 @@ mysql_prepare(MYSQL *mysql, const char *query, ulong length) ...@@ -3752,7 +3752,6 @@ mysql_prepare(MYSQL *mysql, const char *query, ulong length)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
stmt->state= MY_ST_PREPARE;
init_alloc_root(&stmt->mem_root,8192,0); init_alloc_root(&stmt->mem_root,8192,0);
if (read_prepare_result(mysql, stmt)) if (read_prepare_result(mysql, stmt))
...@@ -3760,7 +3759,7 @@ mysql_prepare(MYSQL *mysql, const char *query, ulong length) ...@@ -3760,7 +3759,7 @@ mysql_prepare(MYSQL *mysql, const char *query, ulong length)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
stmt->state= MY_ST_PREPARE;
stmt->mysql= mysql; stmt->mysql= mysql;
DBUG_PRINT("info", ("Parameter count: %ld", stmt->param_count)); DBUG_PRINT("info", ("Parameter count: %ld", stmt->param_count));
DBUG_RETURN(stmt); DBUG_RETURN(stmt);
...@@ -3897,7 +3896,7 @@ static void store_param_str(NET *net, MYSQL_BIND *param) ...@@ -3897,7 +3896,7 @@ static void store_param_str(NET *net, MYSQL_BIND *param)
ulong length= *param->length; ulong length= *param->length;
char *to= (char *) net_store_length((char *) net->write_pos, length); char *to= (char *) net_store_length((char *) net->write_pos, length);
memcpy(to, param->buffer, length); memcpy(to, param->buffer, length);
net->write_pos+= length; net->write_pos= to+length;
} }
...@@ -3931,17 +3930,19 @@ static my_bool store_param(MYSQL_STMT *stmt, MYSQL_BIND *param) ...@@ -3931,17 +3930,19 @@ static my_bool store_param(MYSQL_STMT *stmt, MYSQL_BIND *param)
MYSQL *mysql= stmt->mysql; MYSQL *mysql= stmt->mysql;
NET *net = &mysql->net; NET *net = &mysql->net;
DBUG_ENTER("store_param"); DBUG_ENTER("store_param");
DBUG_PRINT("enter",("type : %d, buffer :%lx", param->buffer_type, DBUG_PRINT("enter",("type: %d, buffer:%lx, length: %d", param->buffer_type,
param->buffer)); param->buffer ? param->buffer : "0", *param->length));
/* Allocate for worst case (long string) */ if (param->is_null || param->buffer_type == MYSQL_TYPE_NULL)
if ((my_realloc_str(net, 9 + *param->length)))
return 1;
if (!param->buffer)
store_param_null(net, param); store_param_null(net, param);
else else
(*param->store_param_func)(net, param); {
/* Allocate for worst case (long string) */
if ((my_realloc_str(net, 9 + *param->length)))
DBUG_RETURN(1); DBUG_RETURN(1);
(*param->store_param_func)(net, param);
}
DBUG_RETURN(0);
} }
...@@ -3953,13 +3954,13 @@ static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length) ...@@ -3953,13 +3954,13 @@ static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length)
{ {
MYSQL *mysql= stmt->mysql; MYSQL *mysql= stmt->mysql;
NET *net= &mysql->net; NET *net= &mysql->net;
char buff[4]; char buff[MYSQL_STMT_HEADER];
DBUG_ENTER("execute"); DBUG_ENTER("execute");
DBUG_PRINT("enter",("packet: %s, length :%d",packet ? packet :" ", length)); DBUG_PRINT("enter",("packet: %s, length :%d",packet ? packet :" ", length));
mysql->last_used_con= mysql; mysql->last_used_con= mysql;
int4store(buff, stmt->stmt_id); /* Send stmt id to server */ int4store(buff, stmt->stmt_id); /* Send stmt id to server */
if (advanced_command(mysql, COM_EXECUTE, buff, sizeof(buff), packet, if (advanced_command(mysql, COM_EXECUTE, buff, MYSQL_STMT_HEADER, packet,
length, 1) || length, 1) ||
mysql_read_query_result(mysql)) mysql_read_query_result(mysql))
{ {
...@@ -3967,12 +3968,14 @@ static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length) ...@@ -3967,12 +3968,14 @@ static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length)
DBUG_RETURN(1); DBUG_RETURN(1);
} }
stmt->state= MY_ST_EXECUTE; stmt->state= MY_ST_EXECUTE;
mysql_free_result(stmt->result);
if (stmt->bind) #if USED_IN_FETCH
if (stmt->res_buffers) /* Result buffers exists, cache results */
{ {
mysql_free_result(stmt->result); mysql_free_result(stmt->result);
stmt->result= mysql_store_result(mysql); stmt->result= mysql_store_result(mysql);
} }
#endif
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -3983,8 +3986,6 @@ static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length) ...@@ -3983,8 +3986,6 @@ static my_bool execute(MYSQL_STMT * stmt, char *packet, ulong length)
int STDCALL mysql_execute(MYSQL_STMT *stmt) int STDCALL mysql_execute(MYSQL_STMT *stmt)
{ {
ulong length;
uint null_count;
DBUG_ENTER("mysql_execute"); DBUG_ENTER("mysql_execute");
if (stmt->state == MY_ST_UNKNOWN) if (stmt->state == MY_ST_UNKNOWN)
...@@ -3998,14 +3999,18 @@ int STDCALL mysql_execute(MYSQL_STMT *stmt) ...@@ -3998,14 +3999,18 @@ int STDCALL mysql_execute(MYSQL_STMT *stmt)
NET *net= &stmt->mysql->net; NET *net= &stmt->mysql->net;
MYSQL_BIND *param, *param_end; MYSQL_BIND *param, *param_end;
char *param_data; char *param_data;
ulong length;
uint null_count;
my_bool result; my_bool result;
if (!stmt->params) #ifdef CHECK_EXTRA_ARGUMENTS
if (!stmt->param_buffers)
{ {
/* Parameters exists, but no bound buffers */ /* Parameters exists, but no bound buffers */
set_stmt_error(stmt, CR_NOT_ALL_PARAMS_BOUND); set_stmt_error(stmt, CR_NOT_ALL_PARAMS_BOUND);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
#endif
net_clear(net); /* Sets net->write_pos */ net_clear(net); /* Sets net->write_pos */
/* Reserve place for null-marker bytes */ /* Reserve place for null-marker bytes */
null_count= (stmt->param_count+7) /8; null_count= (stmt->param_count+7) /8;
...@@ -4014,10 +4019,9 @@ int STDCALL mysql_execute(MYSQL_STMT *stmt) ...@@ -4014,10 +4019,9 @@ int STDCALL mysql_execute(MYSQL_STMT *stmt)
param_end= stmt->params + stmt->param_count; param_end= stmt->params + stmt->param_count;
/* In case if buffers (type) altered, indicate to server */ /* In case if buffers (type) altered, indicate to server */
*(net->write_pos)++= (uchar) stmt->types_supplied; *(net->write_pos)++= (uchar) stmt->send_types_to_server;
if (!stmt->types_supplied) if (stmt->send_types_to_server)
{ {
stmt->types_supplied=1;
/* /*
Store types of parameters in first in first package Store types of parameters in first in first package
that is sent to the server. that is sent to the server.
...@@ -4039,13 +4043,14 @@ int STDCALL mysql_execute(MYSQL_STMT *stmt) ...@@ -4039,13 +4043,14 @@ int STDCALL mysql_execute(MYSQL_STMT *stmt)
} }
length= (ulong) (net->write_pos - net->buff); length= (ulong) (net->write_pos - net->buff);
/* TODO: Look into avoding the following memdup */ /* TODO: Look into avoding the following memdup */
if (!(param_data= my_memdup((byte *) net->buff, length, MYF(0)))) if (!(param_data= my_memdup( net->buff, length, MYF(0))))
{ {
set_stmt_error(stmt, CR_OUT_OF_MEMORY); set_stmt_error(stmt, CR_OUT_OF_MEMORY);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
net->write_pos= net->buff; /* Reset for net_write() */ net->write_pos= net->buff; /* Reset for net_write() */
result= execute(stmt, param_data, length); result= execute(stmt, param_data, length);
stmt->send_types_to_server=0;
my_free(param_data, MYF(MY_WME)); my_free(param_data, MYF(MY_WME));
DBUG_RETURN(result); DBUG_RETURN(result);
} }
...@@ -4108,6 +4113,7 @@ my_bool STDCALL mysql_bind_param(MYSQL_STMT *stmt, MYSQL_BIND * bind) ...@@ -4108,6 +4113,7 @@ my_bool STDCALL mysql_bind_param(MYSQL_STMT *stmt, MYSQL_BIND * bind)
param->param_number); param->param_number);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
/* /*
If param->length is not given, change it to point to bind_length. If param->length is not given, change it to point to bind_length.
This way we can always use *param->length to get the length of data This way we can always use *param->length to get the length of data
...@@ -4117,6 +4123,9 @@ my_bool STDCALL mysql_bind_param(MYSQL_STMT *stmt, MYSQL_BIND * bind) ...@@ -4117,6 +4123,9 @@ my_bool STDCALL mysql_bind_param(MYSQL_STMT *stmt, MYSQL_BIND * bind)
/* Setup data copy functions for the different supported types */ /* Setup data copy functions for the different supported types */
switch (param->buffer_type) { switch (param->buffer_type) {
case MYSQL_TYPE_NULL:
param->is_null=1;
break;
case MYSQL_TYPE_TINY: case MYSQL_TYPE_TINY:
param->bind_length= 1; param->bind_length= 1;
param->store_param_func= store_param_tinyint; param->store_param_func= store_param_tinyint;
...@@ -4138,12 +4147,13 @@ my_bool STDCALL mysql_bind_param(MYSQL_STMT *stmt, MYSQL_BIND * bind) ...@@ -4138,12 +4147,13 @@ my_bool STDCALL mysql_bind_param(MYSQL_STMT *stmt, MYSQL_BIND * bind)
param->store_param_func= store_param_float; param->store_param_func= store_param_float;
break; break;
case MYSQL_TYPE_DOUBLE: case MYSQL_TYPE_DOUBLE:
param->bind_length= 4; param->bind_length= 8;
param->store_param_func= store_param_double; param->store_param_func= store_param_double;
break; break;
case MYSQL_TYPE_TINY_BLOB: case MYSQL_TYPE_TINY_BLOB:
case MYSQL_TYPE_MEDIUM_BLOB: case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB: case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_BLOB:
case MYSQL_TYPE_VAR_STRING: case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING: case MYSQL_TYPE_STRING:
param->bind_length= param->buffer_length; param->bind_length= param->buffer_length;
...@@ -4156,7 +4166,8 @@ my_bool STDCALL mysql_bind_param(MYSQL_STMT *stmt, MYSQL_BIND * bind) ...@@ -4156,7 +4166,8 @@ my_bool STDCALL mysql_bind_param(MYSQL_STMT *stmt, MYSQL_BIND * bind)
} }
} }
/* We have to send/resendtype information to MySQL */ /* We have to send/resendtype information to MySQL */
stmt->types_supplied= 0; stmt->send_types_to_server= 1;
stmt->param_buffers= 1;
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -4230,6 +4241,73 @@ mysql_send_long_data(MYSQL_STMT *stmt, uint param_number, ...@@ -4230,6 +4241,73 @@ mysql_send_long_data(MYSQL_STMT *stmt, uint param_number,
Fetch-bind related implementations Fetch-bind related implementations
*********************************************************************/ *********************************************************************/
/****************************************************************************
Functions to fetch data to application buffers
All functions has the following characteristics:
SYNOPSIS
fetch_result_xxx()
param MySQL bind param
row Row value
RETURN VALUES
0 ok
1 Error (Can't alloc net->buffer)
****************************************************************************/
static void fetch_result_tinyint(MYSQL_BIND *param, uchar **row)
{
*param->buffer= (uchar) **row;
*row++;
}
static void fetch_result_short(MYSQL_BIND *param, uchar **row)
{
short value= *(short *)row;
int2store(param->buffer, value);
*row+=2;
}
static void fetch_result_int32(MYSQL_BIND *param, uchar **row)
{
int32 value= *(int32 *)row;
int4store(param->buffer, value);
*row+=4;
}
static void fetch_result_int64(MYSQL_BIND *param, uchar **row)
{
longlong value= *(longlong *)row;
int8store(param->buffer, value);
*row+=8;
}
static void fetch_result_float(MYSQL_BIND *param, uchar **row)
{
float value;
float4get(value,*row);
float4store(param->buffer, *row);
*row+=4;
}
static void fetch_result_double(MYSQL_BIND *param, uchar **row)
{
double value;
float8get(value,*row);
float8store(param->buffer, value);
*row+=8;
}
static void fetch_result_str(MYSQL_BIND *param, uchar **row)
{
ulong length= net_field_length(row);
memcpy(param->buffer, (char *)*row, length);
*param->length= length;
*row+=length;
}
/* /*
Setup the bind buffers for resultset processing Setup the bind buffers for resultset processing
*/ */
...@@ -4241,21 +4319,62 @@ my_bool STDCALL mysql_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind) ...@@ -4241,21 +4319,62 @@ my_bool STDCALL mysql_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind)
DBUG_ENTER("mysql_bind_result"); DBUG_ENTER("mysql_bind_result");
DBUG_ASSERT(stmt != 0); DBUG_ASSERT(stmt != 0);
#ifdef EXTRA_CHECK_ARGUMENTS #ifdef CHECK_EXTRA_ARGUMENTS
if (!bind) if (!bind)
{ {
set_stmt_error(stmt, CR_NULL_POINTER); set_stmt_error(stmt, CR_NULL_POINTER);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
#endif #endif
bind_count= stmt->result->field_count; bind_count= stmt->field_count;
memcpy((char*) stmt->bind, (char*) bind, memcpy((char*) stmt->bind, (char*) bind,
sizeof(MYSQL_BIND)*bind_count); sizeof(MYSQL_BIND)*bind_count);
for (param= stmt->bind, end= param+bind_count; param < end ; param++) for (param= stmt->bind, end= param+bind_count; param < end ; param++)
{ {
/* TODO: Set up convert functions like in mysql_bind_param */ /* Setup data copy functions for the different supported types */
switch (param->buffer_type) {
case MYSQL_TYPE_TINY:
param->bind_length= 1;
param->fetch_result= fetch_result_tinyint;
break;
case MYSQL_TYPE_SHORT:
param->bind_length= 2;
param->fetch_result= fetch_result_short;
break;
case MYSQL_TYPE_LONG:
param->bind_length= 4;
param->fetch_result= fetch_result_int32;
break;
case MYSQL_TYPE_LONGLONG:
param->bind_length= 8;
param->fetch_result= fetch_result_int64;
break;
case MYSQL_TYPE_FLOAT:
param->bind_length= 4;
param->fetch_result= fetch_result_float;
break;
case MYSQL_TYPE_DOUBLE:
param->bind_length= 8;
param->fetch_result= fetch_result_double;
break;
case MYSQL_TYPE_TINY_BLOB:
case MYSQL_TYPE_MEDIUM_BLOB:
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_STRING:
param->length= &param->buffer_length;
param->fetch_result= fetch_result_str;
break;
default:
sprintf(stmt->last_error, ER(stmt->last_errno= CR_UNSUPPORTED_PARAM_TYPE),
param->buffer_type, param->param_number);
DBUG_RETURN(1);
} }
if (!param->length)
param->length= &param->bind_length;
}
stmt->res_buffers= 1;
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -4265,16 +4384,16 @@ my_bool STDCALL mysql_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind) ...@@ -4265,16 +4384,16 @@ my_bool STDCALL mysql_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind)
*/ */
static my_bool static my_bool
my_fetch_row(MYSQL_STMT *stmt, MYSQL_RES *result, const byte *row) stmt_fetch_row(MYSQL_STMT *stmt, uchar **row)
{ {
MYSQL_BIND *bind, *end; MYSQL_BIND *bind, *end;
uchar *null_ptr= (uchar*) row, bit; uchar *null_ptr= (uchar*) *row, bit;
result->row_count++; *row+= (stmt->field_count+7)/8;
row+= (result->field_count+7)/8;
/* Copy complete row to application buffers */
bit=1; bit=1;
for (bind= stmt->bind, end= (MYSQL_BIND *) bind + result->field_count;
/* Copy complete row to application buffers */
for (bind= stmt->bind, end= (MYSQL_BIND *) bind + stmt->field_count;
bind < end; bind < end;
bind++) bind++)
{ {
...@@ -4283,7 +4402,7 @@ my_fetch_row(MYSQL_STMT *stmt, MYSQL_RES *result, const byte *row) ...@@ -4283,7 +4402,7 @@ my_fetch_row(MYSQL_STMT *stmt, MYSQL_RES *result, const byte *row)
else else
{ {
bind->is_null= 0; bind->is_null= 0;
row= (byte*) (*bind->fetch_result)(bind, (char*) row); (*bind->fetch_result)(bind, row);
} }
if (! (bit<<=1) & 255) if (! (bit<<=1) & 255)
{ {
...@@ -4294,12 +4413,9 @@ my_fetch_row(MYSQL_STMT *stmt, MYSQL_RES *result, const byte *row) ...@@ -4294,12 +4413,9 @@ my_fetch_row(MYSQL_STMT *stmt, MYSQL_RES *result, const byte *row)
return 0; return 0;
} }
static int read_binary_data(MYSQL *mysql)
static int
read_binary_data(MYSQL *mysql)
{ {
ulong pkt_len; if (packet_error == net_safe_read(mysql))
if ((pkt_len= net_safe_read(mysql)) == packet_error)
return -1; return -1;
if (mysql->net.read_pos[0]) if (mysql->net.read_pos[0])
return 1; /* End of data */ return 1; /* End of data */
...@@ -4313,57 +4429,30 @@ read_binary_data(MYSQL *mysql) ...@@ -4313,57 +4429,30 @@ read_binary_data(MYSQL *mysql)
int STDCALL mysql_fetch(MYSQL_STMT *stmt) int STDCALL mysql_fetch(MYSQL_STMT *stmt)
{ {
MYSQL_RES *result; MYSQL *mysql= stmt->mysql;
DBUG_ENTER("mysql_fetch"); DBUG_ENTER("mysql_fetch");
result= stmt->result; if (stmt->res_buffers)
if (!result)
DBUG_RETURN(MYSQL_NO_DATA);
if (!result->data)
{
MYSQL *mysql= stmt->mysql;
if (!result->eof)
{ {
int res; int res;
if (!(res= read_binary_data(result->handle))) if (!(res= read_binary_data(mysql)))
DBUG_RETURN((int) my_fetch_row(stmt, result, {
(byte*) mysql->net.read_pos+1)); if (stmt->res_buffers)
DBUG_RETURN((int) stmt_fetch_row(stmt,(uchar **) &mysql->net.read_pos+1));
DBUG_RETURN(0);
}
DBUG_PRINT("info", ("end of data")); DBUG_PRINT("info", ("end of data"));
result->eof= 1; mysql->status= MYSQL_STATUS_READY;
result->handle->status= MYSQL_STATUS_READY;
/* Don't clear handle in mysql_free_results */
result->handle= 0;
if (res < 0) /* Network error */ if (res < 0) /* Network error */
{ {
set_stmt_errmsg(stmt,(char *)mysql->net.last_error, set_stmt_errmsg(stmt,(char *)mysql->net.last_error,
mysql->net.last_errno); mysql->net.last_errno);
DBUG_RETURN(MYSQL_STATUS_ERROR); DBUG_RETURN(MYSQL_STATUS_ERROR);
} }
}
DBUG_RETURN(MYSQL_NO_DATA); /* no more data */ DBUG_RETURN(MYSQL_NO_DATA); /* no more data */
} }
{ DBUG_RETURN(0); //?? do we need to set MYSQL_STATUS_READY ?
/*
For prepared statements, the row data is a string of binary bytes,
not a set of string pointers as for normal statements
It's however convenient to use the data pointer also for prepared
statements.
*/
MYSQL_ROW values;
if (!result->data_cursor)
{
DBUG_PRINT("info", ("end of data"));
result->current_row= (MYSQL_ROW) NULL;
DBUG_RETURN(MYSQL_NO_DATA);
}
values= result->data_cursor->data;
result->data_cursor= result->data_cursor->next;
DBUG_RETURN((int) my_fetch_row(stmt,result, (byte*) values));
}
DBUG_RETURN(0);
} }
...@@ -4380,17 +4469,15 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt) ...@@ -4380,17 +4469,15 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt)
my_bool error=0; my_bool error=0;
DBUG_ENTER("mysql_stmt_close"); DBUG_ENTER("mysql_stmt_close");
if (stmt->state) if (stmt->state != MY_ST_UNKNOWN)
{ {
char buff[4]; char buff[4];
int4store(buff, stmt->stmt_id); int4store(buff, stmt->stmt_id);
error= simple_command(stmt->mysql, COM_CLOSE_STMT, buff, 4, 0); error= simple_command(stmt->mysql, COM_CLOSE_STMT, buff, 4, 0);
} }
mysql_free_result(stmt->result);
free_root(&stmt->mem_root, MYF(0)); free_root(&stmt->mem_root, MYF(0));
my_free((gptr) stmt->query, MYF(MY_WME | MY_ALLOW_ZERO_PTR)); my_free((gptr) stmt->query, MYF(MY_WME | MY_ALLOW_ZERO_PTR));
my_free((gptr) stmt->bind, MY_ALLOW_ZERO_PTR);
my_free((gptr) stmt->params, MY_ALLOW_ZERO_PTR);
my_free((gptr) stmt, MYF(MY_WME)); my_free((gptr) stmt, MYF(MY_WME));
DBUG_RETURN(error); DBUG_RETURN(error);
} }
......
libmysql/libmysql.def
View file @ 4b85d31b
...@@ -102,6 +102,22 @@ EXPORTS ...@@ -102,6 +102,22 @@ EXPORTS
mysql_add_slave mysql_add_slave
mysql_warning_count mysql_warning_count
mysql_warnings mysql_warnings
mysql_prepare
mysql_execute
mysql_param_count
mysql_bind_param
mysql_bind_result
mysql_prepare_result
mysql_stmt_close
mysql_stmt_error
mysql_stmt_errno
mysql_fetch
mysql_send_long_data
mysql_multi_query
mysql_next_result
mysql_commit
mysql_rollback
mysql_autocommit
......
mysql-test/r/subselect.result
View file @ 4b85d31b
...@@ -9,9 +9,14 @@ SELECT (SELECT (SELECT 0 UNION SELECT 0)); ...@@ -9,9 +9,14 @@ SELECT (SELECT (SELECT 0 UNION SELECT 0));
(SELECT (SELECT 0 UNION SELECT 0)) (SELECT (SELECT 0 UNION SELECT 0))
0 0
SELECT (SELECT 1 FROM (SELECT 1) HAVING a=1) as a; SELECT (SELECT 1 FROM (SELECT 1) HAVING a=1) as a;
Cyclic reference on subqueries Reference 'a' not supported (forward reference in item list)
SELECT (SELECT 1 FROM (SELECT 1) HAVING b=1) as a,(SELECT 1 FROM (SELECT 1) HAVING a=1) as b; SELECT (SELECT 1 FROM (SELECT 1) HAVING b=1) as a,(SELECT 1 FROM (SELECT 1) HAVING a=1) as b;
Cyclic reference on subqueries Reference 'b' not supported (forward reference in item list)
SELECT (SELECT 1),MAX(1) FROM (SELECT 1);
(SELECT 1) MAX(1)
1 1
SELECT (SELECT a) as a;
Reference 'a' not supported (forward reference in item list)
drop table if exists t1,t2,t3,t4,t5,attend,clinic,inscrit; drop table if exists t1,t2,t3,t4,t5,attend,clinic,inscrit;
create table t1 (a int); create table t1 (a int);
create table t2 (a int, b int); create table t2 (a int, b int);
...@@ -20,6 +25,8 @@ create table t4 (a int, b int); ...@@ -20,6 +25,8 @@ create table t4 (a int, b int);
insert into t1 values (2); insert into t1 values (2);
insert into t2 values (1,7),(2,7); insert into t2 values (1,7),(2,7);
insert into t4 values (4,8),(3,8),(5,9); insert into t4 values (4,8),(3,8),(5,9);
select (select a from t1 where t1.a = a1) as a2, (select b from t2 where t2.b=a2) as a1;
Reference 'a1' not supported (forward reference in item list)
select (select a from t1 where t1.a=t2.a), a from t2; select (select a from t1 where t1.a=t2.a), a from t2;
(select a from t1 where t1.a=t2.a) a (select a from t1 where t1.a=t2.a) a
NULL 1 NULL 1
...@@ -278,6 +285,12 @@ PRIMARY KEY (`numeropost`,`numreponse`), ...@@ -278,6 +285,12 @@ PRIMARY KEY (`numeropost`,`numreponse`),
UNIQUE KEY `numreponse` (`numreponse`), UNIQUE KEY `numreponse` (`numreponse`),
KEY `pseudo` (`pseudo`,`numeropost`) KEY `pseudo` (`pseudo`,`numeropost`)
) TYPE=MyISAM; ) TYPE=MyISAM;
SELECT (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=a),numreponse FROM (SELECT * FROM threadhardwarefr7) as a;
Reference 'numreponse' not supported (forward reference in item list)
SELECT numreponse, (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=a) FROM (SELECT * FROM threadhardwarefr7) as a;
Unknown column 'a' in 'having clause'
SELECT numreponse, (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=1) FROM (SELECT * FROM threadhardwarefr7) as a;
numreponse (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=1)
INSERT INTO threadhardwarefr7 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test'); INSERT INTO threadhardwarefr7 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
EXPLAIN SELECT numreponse FROM threadhardwarefr7 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM threadhardwarefr7 WHERE numeropost='1'); EXPLAIN SELECT numreponse FROM threadhardwarefr7 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM threadhardwarefr7 WHERE numeropost='1');
Subselect returns more than 1 record Subselect returns more than 1 record
......
mysql-test/t/subselect.test
View file @ 4b85d31b
select (select 2); select (select 2);
SELECT (SELECT 1) UNION SELECT (SELECT 2); SELECT (SELECT 1) UNION SELECT (SELECT 2);
SELECT (SELECT (SELECT 0 UNION SELECT 0)); SELECT (SELECT (SELECT 0 UNION SELECT 0));
-- error 1243 -- error 1245
SELECT (SELECT 1 FROM (SELECT 1) HAVING a=1) as a; SELECT (SELECT 1 FROM (SELECT 1) HAVING a=1) as a;
-- error 1243 -- error 1245
SELECT (SELECT 1 FROM (SELECT 1) HAVING b=1) as a,(SELECT 1 FROM (SELECT 1) HAVING a=1) as b; SELECT (SELECT 1 FROM (SELECT 1) HAVING b=1) as a,(SELECT 1 FROM (SELECT 1) HAVING a=1) as b;
SELECT (SELECT 1),MAX(1) FROM (SELECT 1);
-- error 1245
SELECT (SELECT a) as a;
drop table if exists t1,t2,t3,t4,t5,attend,clinic,inscrit; drop table if exists t1,t2,t3,t4,t5,attend,clinic,inscrit;
create table t1 (a int); create table t1 (a int);
create table t2 (a int, b int); create table t2 (a int, b int);
...@@ -13,6 +16,8 @@ create table t4 (a int, b int); ...@@ -13,6 +16,8 @@ create table t4 (a int, b int);
insert into t1 values (2); insert into t1 values (2);
insert into t2 values (1,7),(2,7); insert into t2 values (1,7),(2,7);
insert into t4 values (4,8),(3,8),(5,9); insert into t4 values (4,8),(3,8),(5,9);
-- error 1245
select (select a from t1 where t1.a = a1) as a2, (select b from t2 where t2.b=a2) as a1;
select (select a from t1 where t1.a=t2.a), a from t2; select (select a from t1 where t1.a=t2.a), a from t2;
select (select a from t1 where t1.a=t2.b), a from t2; select (select a from t1 where t1.a=t2.b), a from t2;
select (select a from t1), a from t2; select (select a from t1), a from t2;
...@@ -176,6 +181,11 @@ CREATE TABLE `threadhardwarefr7` ( ...@@ -176,6 +181,11 @@ CREATE TABLE `threadhardwarefr7` (
UNIQUE KEY `numreponse` (`numreponse`), UNIQUE KEY `numreponse` (`numreponse`),
KEY `pseudo` (`pseudo`,`numeropost`) KEY `pseudo` (`pseudo`,`numeropost`)
) TYPE=MyISAM; ) TYPE=MyISAM;
-- error 1245
SELECT (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=a),numreponse FROM (SELECT * FROM threadhardwarefr7) as a;
-- error 1054
SELECT numreponse, (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=a) FROM (SELECT * FROM threadhardwarefr7) as a;
SELECT numreponse, (SELECT numeropost FROM threadhardwarefr7 HAVING numreponse=1) FROM (SELECT * FROM threadhardwarefr7) as a;
INSERT INTO threadhardwarefr7 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test'); INSERT INTO threadhardwarefr7 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test');
-- error 1240 -- error 1240
EXPLAIN SELECT numreponse FROM threadhardwarefr7 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM threadhardwarefr7 WHERE numeropost='1'); EXPLAIN SELECT numreponse FROM threadhardwarefr7 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM threadhardwarefr7 WHERE numeropost='1');
......
sql/item.cc
View file @ 4b85d31b
...@@ -34,7 +34,8 @@ void item_init(void) ...@@ -34,7 +34,8 @@ void item_init(void)
item_user_lock_init(); item_user_lock_init();
} }
Item::Item() Item::Item():
fixed(0)
{ {
marker=0; marker=0;
maybe_null=null_value=with_sum_func=unsigned_flag=0; maybe_null=null_value=with_sum_func=unsigned_flag=0;
...@@ -139,6 +140,7 @@ CHARSET_INFO * Item::thd_charset() const ...@@ -139,6 +140,7 @@ CHARSET_INFO * Item::thd_charset() const
Item_field::Item_field(Field *f) :Item_ident(NullS,f->table_name,f->field_name) Item_field::Item_field(Field *f) :Item_ident(NullS,f->table_name,f->field_name)
{ {
set_field(f); set_field(f);
fixed= 1; // This item is not needed in fix_fields
} }
...@@ -315,32 +317,27 @@ void Item_param::set_null() ...@@ -315,32 +317,27 @@ void Item_param::set_null()
void Item_param::set_int(longlong i) void Item_param::set_int(longlong i)
{ {
int_value=(longlong)i; int_value=(longlong)i;
item_result_type = INT_RESULT;
item_type = INT_ITEM; item_type = INT_ITEM;
} }
void Item_param::set_double(double value) void Item_param::set_double(double value)
{ {
real_value=value; real_value=value;
item_result_type = REAL_RESULT;
item_type = REAL_ITEM; item_type = REAL_ITEM;
} }
void Item_param::set_value(const char *str, uint length, CHARSET_INFO *cs) void Item_param::set_value(const char *str, uint length)
{ {
str_value.set(str,length,cs); str_value.set(str,length,thd_charset());
item_result_type = STRING_RESULT;
item_type = STRING_ITEM; item_type = STRING_ITEM;
} }
void Item_param::set_longdata(const char *str, ulong length, CHARSET_INFO *cs) void Item_param::set_longdata(const char *str, ulong length)
{ {
/* TODO: Fix this for binary handling by making use of
buffer_type..
*/
str_value.append(str,length); str_value.append(str,length);
long_data_supplied= 1;
} }
...@@ -438,6 +435,7 @@ bool Item::fix_fields(THD *thd, ...@@ -438,6 +435,7 @@ bool Item::fix_fields(THD *thd,
struct st_table_list *list, struct st_table_list *list,
Item ** ref) Item ** ref)
{ {
fixed= 1;
return 0; return 0;
} }
...@@ -459,23 +457,48 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -459,23 +457,48 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
*/ */
SELECT_LEX *last= 0; SELECT_LEX *last= 0;
Item **refer= (Item **)not_found_item;
// Prevent using outer fields in subselects, that is not supported now // Prevent using outer fields in subselects, that is not supported now
if (thd->lex.current_select->linkage != DERIVED_TABLE_TYPE) if (thd->lex.current_select->linkage != DERIVED_TABLE_TYPE)
for (SELECT_LEX *sl= thd->lex.current_select->outer_select(); for (SELECT_LEX *sl= thd->lex.current_select->outer_select();
sl; sl;
sl= sl->outer_select()) sl= sl->outer_select())
{
if ((tmp= find_field_in_tables(thd, this, if ((tmp= find_field_in_tables(thd, this,
(last= sl)->get_table_list(), (last= sl)->get_table_list(),
0)) != not_found_field) 0)) != not_found_field)
break; break;
if((refer= find_item_in_list(this, (last= sl)->item_list,
REPORT_EXCEPT_NOT_FOUND)) !=
(Item **)not_found_item)
break;
}
if (!tmp) if (!tmp)
return -1; return -1;
else if (tmp == not_found_field) else if (!refer)
return 1;
else if (tmp == not_found_field && refer == (Item **)not_found_item)
{ {
// call to return error code // call to return error code
find_field_in_tables(thd, this, tables, 1); find_field_in_tables(thd, this, tables, 1);
return -1; return -1;
} }
else if (refer != (Item **)not_found_item)
{
Item_ref *r;
*ref= r= new Item_ref((char *)db_name, (char *)table_name,
(char *)field_name);
if (!r)
return 1;
int res;
if ((res= r->fix_fields(thd, tables, ref)))
return res;
r->depended_from= last;
thd->lex.current_select->mark_as_dependent(last);
thd->add_possible_loop(r);
return 0;
}
else else
{ {
depended_from= last; depended_from= last;
...@@ -507,6 +530,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -507,6 +530,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
return 1; return 1;
return (*ref)->fix_fields(thd, tables, ref); return (*ref)->fix_fields(thd, tables, ref);
} }
fixed= 1;
return 0; return 0;
} }
...@@ -885,6 +909,19 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference) ...@@ -885,6 +909,19 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
maybe_null= (*ref)->maybe_null; maybe_null= (*ref)->maybe_null;
decimals= (*ref)->decimals; decimals= (*ref)->decimals;
} }
if (((*ref)->with_sum_func &&
(depended_from ||
!(thd->lex.current_select->linkage != GLOBAL_OPTIONS_TYPE &&
thd->lex.current_select->select_lex()->having_fix_field))) ||
!(*ref)->fixed)
{
my_error(ER_ILLEGAL_REFERENCE, MYF(0), name,
((*ref)->with_sum_func?
"reference on group function":
"forward reference in item list"));
return 1;
}
fixed= 1;
return 0; return 0;
} }
......
sql/item.h
View file @ 4b85d31b
...@@ -46,6 +46,7 @@ public: ...@@ -46,6 +46,7 @@ public:
my_bool null_value; /* if item is null */ my_bool null_value; /* if item is null */
my_bool unsigned_flag; my_bool unsigned_flag;
my_bool with_sum_func; my_bool with_sum_func;
my_bool fixed; /* If item fixed with fix_fields */
// alloc & destruct is done as start of select using sql_alloc // alloc & destruct is done as start of select using sql_alloc
Item(); Item();
...@@ -186,8 +187,8 @@ public: ...@@ -186,8 +187,8 @@ public:
Item_param(char *name_par=0) Item_param(char *name_par=0)
{ {
name= name_par ? name_par : (char*) "?"; name= name_par ? name_par : (char*) "?";
long_data_supplied = false; long_data_supplied= false;
item_type = STRING_ITEM; item_type= STRING_ITEM;
item_result_type = STRING_RESULT; item_result_type = STRING_RESULT;
} }
enum Type type() const { return item_type; } enum Type type() const { return item_type; }
...@@ -199,12 +200,13 @@ public: ...@@ -199,12 +200,13 @@ public:
void set_null(); void set_null();
void set_int(longlong i); void set_int(longlong i);
void set_double(double i); void set_double(double i);
void set_value(const char *str, uint length, CHARSET_INFO *cs); void set_value(const char *str, uint length);
void set_long_str(const char *str, ulong length, CHARSET_INFO *cs); void set_long_str(const char *str, ulong length);
void set_long_binary(const char *str, ulong length, CHARSET_INFO *cs); void set_long_binary(const char *str, ulong length);
void set_longdata(const char *str, ulong length, CHARSET_INFO *cs); void set_longdata(const char *str, ulong length);
void set_long_end(); void set_long_end();
void reset() {} void reset() {}
void (*setup_param_func)(Item_param *param, uchar **pos);
enum Item_result result_type () const enum Item_result result_type () const
{ return item_result_type; } { return item_result_type; }
Item *new_item() { return new Item_param(name); } Item *new_item() { return new Item_param(name); }
...@@ -401,8 +403,8 @@ public: ...@@ -401,8 +403,8 @@ public:
:Item_ident(NullS,table_name_par,field_name_par),ref(item) {} :Item_ident(NullS,table_name_par,field_name_par),ref(item) {}
enum Type type() const { return REF_ITEM; } enum Type type() const { return REF_ITEM; }
bool eq(const Item *item, bool binary_cmp) const bool eq(const Item *item, bool binary_cmp) const
{ return (*ref)->eq(item, binary_cmp); } { return ref && (*ref)->eq(item, binary_cmp); }
~Item_ref() { if (ref) delete *ref; } ~Item_ref() { if (ref && (*ref) != this) delete *ref; }
double val() double val()
{ {
double tmp=(*ref)->val_result(); double tmp=(*ref)->val_result();
......
sql/item_cmpfunc.cc
View file @ 4b85d31b
...@@ -1160,6 +1160,7 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -1160,6 +1160,7 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
if (thd) if (thd)
thd->cond_count+=list.elements; thd->cond_count+=list.elements;
fix_length_and_dec(); fix_length_and_dec();
fixed= 1;
return 0; return 0;
} }
...@@ -1485,6 +1486,7 @@ Item_func_regex::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -1485,6 +1486,7 @@ Item_func_regex::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
} }
else else
maybe_null=1; maybe_null=1;
fixed= 1;
return 0; return 0;
} }
......
sql/item_func.cc
View file @ 4b85d31b
...@@ -123,6 +123,7 @@ Item_func::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -123,6 +123,7 @@ Item_func::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
} }
} }
fix_length_and_dec(); fix_length_and_dec();
fixed= 1;
return 0; return 0;
} }
......
sql/item_func.h
View file @ 4b85d31b
...@@ -754,6 +754,7 @@ public: ...@@ -754,6 +754,7 @@ public:
bool res= udf.fix_fields(thd, tables, this, arg_count, args); bool res= udf.fix_fields(thd, tables, this, arg_count, args);
used_tables_cache= udf.used_tables_cache; used_tables_cache= udf.used_tables_cache;
const_item_cache= udf.const_item_cache; const_item_cache= udf.const_item_cache;
fixed= 1;
return res; return res;
} }
Item_result result_type () const { return udf.result_type(); } Item_result result_type () const { return udf.result_type(); }
......
sql/item_strfunc.cc
View file @ 4b85d31b
...@@ -2079,6 +2079,7 @@ bool Item_func_conv_charset::fix_fields(THD *thd,struct st_table_list *tables, I ...@@ -2079,6 +2079,7 @@ bool Item_func_conv_charset::fix_fields(THD *thd,struct st_table_list *tables, I
const_item_cache=args[0]->const_item(); const_item_cache=args[0]->const_item();
set_charset(conv_charset); set_charset(conv_charset);
fix_length_and_dec(); fix_length_and_dec();
fixed= 1;
return 0; return 0;
} }
...@@ -2113,6 +2114,7 @@ bool Item_func_set_collation::fix_fields(THD *thd,struct st_table_list *tables, ...@@ -2113,6 +2114,7 @@ bool Item_func_set_collation::fix_fields(THD *thd,struct st_table_list *tables,
used_tables_cache=args[0]->used_tables(); used_tables_cache=args[0]->used_tables();
const_item_cache=args[0]->const_item(); const_item_cache=args[0]->const_item();
fix_length_and_dec(); fix_length_and_dec();
fixed= 1;
return 0; return 0;
} }
......
sql/item_subselect.cc
View file @ 4b85d31b
...@@ -92,6 +92,7 @@ bool Item_subselect::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -92,6 +92,7 @@ bool Item_subselect::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
} }
fix_length_and_dec(); fix_length_and_dec();
} }
fixed= 1;
return res; return res;
} }
......
sql/item_sum.cc
View file @ 4b85d31b
...@@ -135,6 +135,7 @@ Item_sum_num::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -135,6 +135,7 @@ Item_sum_num::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
null_value=1; null_value=1;
fix_length_and_dec(); fix_length_and_dec();
thd->allow_sum_func=1; // Allow group functions thd->allow_sum_func=1; // Allow group functions
fixed= 1;
return 0; return 0;
} }
...@@ -165,6 +166,7 @@ Item_sum_hybrid::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) ...@@ -165,6 +166,7 @@ Item_sum_hybrid::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
null_value=1; null_value=1;
fix_length_and_dec(); fix_length_and_dec();
thd->allow_sum_func=1; // Allow group functions thd->allow_sum_func=1; // Allow group functions
fixed= 1;
return 0; return 0;
} }
......
sql/item_sum.h
View file @ 4b85d31b
...@@ -384,6 +384,7 @@ public: ...@@ -384,6 +384,7 @@ public:
const char *func_name() const { return udf.name(); } const char *func_name() const { return udf.name(); }
bool fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) bool fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
{ {
fixed= 1;
return udf.fix_fields(thd,tables,this,this->arg_count,this->args); return udf.fix_fields(thd,tables,this,this->arg_count,this->args);
} }
enum Sumfunctype sum_func () const { return UDF_SUM_FUNC; } enum Sumfunctype sum_func () const { return UDF_SUM_FUNC; }
......
sql/item_uniq.h
View file @ 4b85d31b
...@@ -43,5 +43,9 @@ public: ...@@ -43,5 +43,9 @@ public:
bool add() { return 0; } bool add() { return 0; }
void reset_field() {} void reset_field() {}
void update_field(int offset) {} void update_field(int offset) {}
bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) { return 0;} bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref)
{
fixed= 1;
return 0;
}
}; };
sql/mysql_priv.h
View file @ 4b85d31b
...@@ -513,7 +513,7 @@ int mysqld_show_column_types(THD *thd); ...@@ -513,7 +513,7 @@ int mysqld_show_column_types(THD *thd);
int mysqld_help (THD *thd, const char *text); int mysqld_help (THD *thd, const char *text);
/* sql_prepare.cc */ /* sql_prepare.cc */
int compare_prep_stmt(PREP_STMT *a, PREP_STMT *b, void *not_used); int compare_prep_stmt(void *not_used, PREP_STMT *stmt, ulong *key);
void free_prep_stmt(PREP_STMT *stmt, TREE_FREE mode, void *not_used); void free_prep_stmt(PREP_STMT *stmt, TREE_FREE mode, void *not_used);
bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length); bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length);
void mysql_stmt_execute(THD *thd, char *packet); void mysql_stmt_execute(THD *thd, char *packet);
......
sql/share/czech/errmsg.txt
View file @ 4b85d31b
...@@ -254,4 +254,5 @@ ...@@ -254,4 +254,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/danish/errmsg.txt
View file @ 4b85d31b
...@@ -248,4 +248,5 @@ ...@@ -248,4 +248,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/dutch/errmsg.txt
View file @ 4b85d31b
...@@ -256,4 +256,5 @@ ...@@ -256,4 +256,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/english/errmsg.txt
View file @ 4b85d31b
...@@ -245,4 +245,5 @@ ...@@ -245,4 +245,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/estonian/errmsg.txt
View file @ 4b85d31b
...@@ -250,4 +250,5 @@ ...@@ -250,4 +250,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/french/errmsg.txt
View file @ 4b85d31b
...@@ -245,4 +245,5 @@ ...@@ -245,4 +245,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/german/errmsg.txt
View file @ 4b85d31b
...@@ -248,4 +248,5 @@ ...@@ -248,4 +248,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/greek/errmsg.txt
View file @ 4b85d31b
...@@ -245,4 +245,5 @@ ...@@ -245,4 +245,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/hungarian/errmsg.txt
View file @ 4b85d31b
...@@ -247,4 +247,5 @@ ...@@ -247,4 +247,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/italian/errmsg.txt
View file @ 4b85d31b
...@@ -245,4 +245,5 @@ ...@@ -245,4 +245,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/japanese/errmsg.txt
View file @ 4b85d31b
...@@ -247,4 +247,5 @@ ...@@ -247,4 +247,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/korean/errmsg.txt
View file @ 4b85d31b
...@@ -245,4 +245,5 @@ ...@@ -245,4 +245,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/norwegian-ny/errmsg.txt
View file @ 4b85d31b
...@@ -247,4 +247,5 @@ ...@@ -247,4 +247,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/norwegian/errmsg.txt
View file @ 4b85d31b
...@@ -247,4 +247,5 @@ ...@@ -247,4 +247,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/polish/errmsg.txt
View file @ 4b85d31b
...@@ -249,4 +249,5 @@ ...@@ -249,4 +249,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/portuguese/errmsg.txt
View file @ 4b85d31b
...@@ -245,4 +245,5 @@ ...@@ -245,4 +245,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/romanian/errmsg.txt
View file @ 4b85d31b
...@@ -250,3 +250,4 @@ ...@@ -250,3 +250,4 @@
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s"
"Reference '%-.64s' not supported (%s)",
sql/share/russian/errmsg.txt
View file @ 4b85d31b
...@@ -248,4 +248,5 @@ ...@@ -248,4 +248,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
" ", " ",
"Converting column '%s' from %s to %s" " '%s' %s %s",
" '%-.64s' (%s)",
sql/share/serbian/errmsg.txt
View file @ 4b85d31b
...@@ -241,4 +241,5 @@ ...@@ -241,4 +241,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/slovak/errmsg.txt
View file @ 4b85d31b
...@@ -253,4 +253,5 @@ ...@@ -253,4 +253,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/spanish/errmsg.txt
View file @ 4b85d31b
...@@ -246,4 +246,5 @@ ...@@ -246,4 +246,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"Cyclic reference on subqueries", "Cyclic reference on subqueries",
"Converting column '%s' from %s to %s" "Converting column '%s' from %s to %s",
"Reference '%-.64s' not supported (%s)",
sql/share/swedish/errmsg.txt
View file @ 4b85d31b
...@@ -245,4 +245,5 @@ ...@@ -245,4 +245,5 @@
"Okänd PREPARED STATEMENT id (%ld) var given till %s", "Okänd PREPARED STATEMENT id (%ld) var given till %s",
"Hjälp databasen finns inte eller är skadad", "Hjälp databasen finns inte eller är skadad",
"Syklisk referens i subselect", "Syklisk referens i subselect",
"Konvertar kolumn '%s' från %s till %s" "Konvertar kolumn '%s' från %s till %s",
"Reference '%-.64s' not supported (%s)",
sql/share/ukrainian/errmsg.txt
View file @ 4b85d31b
...@@ -250,4 +250,5 @@ ...@@ -250,4 +250,5 @@
"Unknown prepared statement handler (%ld) given to %s", "Unknown prepared statement handler (%ld) given to %s",
"Help database is corrupt or does not exist", "Help database is corrupt or does not exist",
"i i", "i i",
"Converting column '%s' from %s to %s" " '%s' %s %s",
" '%-.64s' i (%s)",
sql/sql_base.cc
View file @ 4b85d31b
...@@ -2225,8 +2225,10 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) ...@@ -2225,8 +2225,10 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
{ {
DBUG_ENTER("setup_conds"); DBUG_ENTER("setup_conds");
thd->set_query_id=1; thd->set_query_id=1;
thd->cond_count=0;
thd->allow_sum_func=0; thd->cond_count= 0;
bool save_allow_sum_func= thd->allow_sum_func;
thd->allow_sum_func= 0;
if (*conds) if (*conds)
{ {
thd->where="where clause"; thd->where="where clause";
...@@ -2299,6 +2301,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) ...@@ -2299,6 +2301,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
table->on_expr=and_conds(table->on_expr,cond_and); table->on_expr=and_conds(table->on_expr,cond_and);
} }
} }
thd->allow_sum_func= save_allow_sum_func;
DBUG_RETURN(test(thd->fatal_error)); DBUG_RETURN(test(thd->fatal_error));
} }
......
sql/sql_class.h
View file @ 4b85d31b
...@@ -325,7 +325,7 @@ typedef struct st_prep_stmt ...@@ -325,7 +325,7 @@ typedef struct st_prep_stmt
uint param_count; uint param_count;
uint last_errno; uint last_errno;
char last_error[MYSQL_ERRMSG_SIZE]; char last_error[MYSQL_ERRMSG_SIZE];
bool error_in_prepare, long_data_used; bool error_in_prepare, long_data_used, param_inited;
} PREP_STMT; } PREP_STMT;
...@@ -510,7 +510,6 @@ public: ...@@ -510,7 +510,6 @@ public:
bool safe_to_cache_query; bool safe_to_cache_query;
bool volatile killed; bool volatile killed;
bool prepare_command; bool prepare_command;
Item_param *params; // Pointer to array of params
/* /*
If we do a purge of binary logs, log index info of the threads If we do a purge of binary logs, log index info of the threads
......
sql/sql_error.cc
View file @ 4b85d31b
...@@ -127,7 +127,7 @@ static const char *warning_level_names[]= {"Note", "Warning", "Error", "?"}; ...@@ -127,7 +127,7 @@ static const char *warning_level_names[]= {"Note", "Warning", "Error", "?"};
my_bool mysqld_show_warnings(THD *thd, ulong levels_to_show) my_bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
{ {
List<Item> field_list; List<Item> field_list;
DBUG_ENTER("mysqld_show_errors"); DBUG_ENTER("mysqld_show_warnings");
field_list.push_back(new Item_empty_string("Level", 7)); field_list.push_back(new Item_empty_string("Level", 7));
field_list.push_back(new Item_int("Code",0,4)); field_list.push_back(new Item_int("Code",0,4));
......
sql/sql_prepare.cc
View file @ 4b85d31b
...@@ -30,10 +30,11 @@ Prepare: ...@@ -30,10 +30,11 @@ Prepare:
Prepare-execute: Prepare-execute:
- Server gets the command 'COM_EXECUTE' to execute the - Server gets the command 'COM_EXECUTE' to execute the
previously prepared query. previously prepared query. If there is any param markers; then client
- If there is are any parameters, then replace the markers with the will send the data in the following format:
data supplied by client with the following format: [null_bits][types_specified(0/1)][[length][data]][[length][data] .. [length][data].
[types_specified(0/1)][type][length][data] .. [type][length].. - Replace the param items with this new data. If it is a first execute
or types altered by client; then setup the conversion routines.
- Execute the query without re-parsing and send back the results - Execute the query without re-parsing and send back the results
to client to client
...@@ -53,33 +54,9 @@ Long data handling: ...@@ -53,33 +54,9 @@ Long data handling:
#include <assert.h> // for DEBUG_ASSERT() #include <assert.h> // for DEBUG_ASSERT()
#include <m_ctype.h> // for isspace() #include <m_ctype.h> // for isspace()
extern int yyparse(void); #define IS_PARAM_NULL(pos, param_no) pos[param_no/8] & (1 << param_no & 7)
static ulong get_param_length(uchar **packet);
static uint get_buffer_type(uchar **packet);
static bool param_is_null(uchar **packet);
static bool setup_param_fields(THD *thd,List<Item> &params);
static uchar* setup_param_field(Item_param *item_param, uchar *pos,
uint buffer_type);
static void setup_longdata_field(Item_param *item_param, uchar *pos);
static bool setup_longdata(THD *thd,List<Item> &params);
static bool send_prepare_results(PREP_STMT *stmt);
static bool parse_prepare_query(PREP_STMT *stmt, char *packet, uint length);
static bool mysql_send_insert_fields(PREP_STMT *stmt, TABLE_LIST *table_list,
List<Item> &fields,
List<List_item> &values_list,
thr_lock_type lock_type);
static bool mysql_test_insert_fields(PREP_STMT *stmt, TABLE_LIST *table_list,
List<Item> &fields,
List<List_item> &values_list,
thr_lock_type lock_type);
static bool mysql_test_upd_fields(PREP_STMT *stmt, TABLE_LIST *table_list,
List<Item> &fields, List<Item> &values,
COND *conds,thr_lock_type lock_type);
static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables,
List<Item> &fields, List<Item> &values,
COND *conds, ORDER *order, ORDER *group,
Item *having,thr_lock_type lock_type);
extern int yyparse(void);
/* /*
Find prepared statement in thd Find prepared statement in thd
...@@ -114,9 +91,9 @@ static PREP_STMT *find_prepared_statement(THD *thd, ulong stmt_id, ...@@ -114,9 +91,9 @@ static PREP_STMT *find_prepared_statement(THD *thd, ulong stmt_id,
Compare two prepared statements; Used to find a prepared statement Compare two prepared statements; Used to find a prepared statement
*/ */
int compare_prep_stmt(PREP_STMT *a, PREP_STMT *b, void *not_used) int compare_prep_stmt(void *not_used, PREP_STMT *stmt, ulong *key)
{ {
return (a->stmt_id < b->stmt_id) ? -1 : (a->stmt_id == b->stmt_id) ? 0 : 1; return (stmt->stmt_id == *key) ? 0 : (stmt->stmt_id < *key) ? -1 : 1;
} }
...@@ -133,21 +110,22 @@ int compare_prep_stmt(PREP_STMT *a, PREP_STMT *b, void *not_used) ...@@ -133,21 +110,22 @@ int compare_prep_stmt(PREP_STMT *a, PREP_STMT *b, void *not_used)
void free_prep_stmt(PREP_STMT *stmt, TREE_FREE mode, void *not_used) void free_prep_stmt(PREP_STMT *stmt, TREE_FREE mode, void *not_used)
{ {
free_root(&stmt->mem_root, MYF(0));
free_items(stmt->free_list); free_items(stmt->free_list);
free_root(&stmt->mem_root, MYF(0));
} }
/* /*
Send prepared stmt info to client after prepare Send prepared stmt info to client after prepare
*/ */
bool send_prep_stmt(PREP_STMT *stmt, uint columns) static bool send_prep_stmt(PREP_STMT *stmt, uint columns)
{ {
NET *net=&stmt->thd->net;
char buff[8]; char buff[8];
int4store(buff, stmt->stmt_id); int4store(buff, stmt->stmt_id);
int2store(buff+4, columns); int2store(buff+4, columns);
int2store(buff+6, stmt->param_count); int2store(buff+6, stmt->param_count);
return my_net_write(&stmt->thd->net, buff, sizeof(buff)); return (my_net_write(net, buff, sizeof(buff)) || net_flush(net));
} }
/* /*
...@@ -156,43 +134,15 @@ bool send_prep_stmt(PREP_STMT *stmt, uint columns) ...@@ -156,43 +134,15 @@ bool send_prep_stmt(PREP_STMT *stmt, uint columns)
TODO: Not yet ready TODO: Not yet ready
*/ */
bool send_item_params(PREP_STMT *stmt) static bool send_item_params(PREP_STMT *stmt)
{ {
#if 0
char buff[1]; char buff[1];
buff[0]=0; buff[0]=0;
return my_net_write(&stmt->thd->net, buff, sizeof(buff)); if (my_net_write(&stmt->thd->net, buff, sizeof(buff)))
}
/*
Read the buffer type, this happens only first time
*/
static uint get_buffer_type(uchar **packet)
{
reg1 uchar *pos= *packet;
(*packet)+= 2;
return (uint) uint2korr(pos);
}
/*
Check for NULL param data
RETURN VALUES
0 Value was not NULL
1 Value was NULL
*/
static bool param_is_null(uchar **packet)
{
reg1 uchar *pos= *packet;
if (*pos == 251)
{
(*packet)++;
return 1; return 1;
} send_eof(stmt->thd);
#endif
return 0; return 0;
} }
...@@ -222,60 +172,103 @@ static ulong get_param_length(uchar **packet) ...@@ -222,60 +172,103 @@ static ulong get_param_length(uchar **packet)
(*packet)+=9; // Must be 254 when here (*packet)+=9; // Must be 254 when here
return (ulong) uint4korr(pos+1); return (ulong) uint4korr(pos+1);
} }
/*
Setup param conversion routines
setup_param_xx()
param Parameter Item
pos Input data buffer
All these functions reads the data from pos and sets up that data
through 'param' and advances the buffer position to predifined
length position.
Make a note that the NULL handling is examined at first execution
(i.e. when input types altered) and for all subsequent executions
we don't read any values for this.
RETURN VALUES
/*
Read and return the data for parameters supplied by client
*/ */
static uchar* setup_param_field(Item_param *item_param, static void setup_param_tiny(Item_param *param, uchar **pos)
uchar *pos, uint buffer_type)
{ {
if (param_is_null(&pos)) param->set_int((longlong)(**pos));
{ *pos+= 1;
item_param->set_null(); }
return(pos);
} static void setup_param_short(Item_param *param, uchar **pos)
switch (buffer_type) { {
param->set_int((longlong)sint2korr(*pos));
*pos+= 2;
}
static void setup_param_int32(Item_param *param, uchar **pos)
{
param->set_int((longlong)sint4korr(*pos));
*pos+= 4;
}
static void setup_param_int64(Item_param *param, uchar **pos)
{
param->set_int((longlong)sint8korr(*pos));
*pos+= 8;
}
static void setup_param_float(Item_param *param, uchar **pos)
{
float data;
float4get(data,*pos);
param->set_double((double) data);
*pos+= 4;
}
static void setup_param_double(Item_param *param, uchar **pos)
{
double data;
float8get(data,*pos);
param->set_double((double) data);
*pos+= 8;
}
static void setup_param_str(Item_param *param, uchar **pos)
{
ulong len=get_param_length(pos);
param->set_value((const char *)*pos, len);
*pos+=len;
}
static void setup_param_functions(Item_param *param, uchar read_pos)
{
switch (read_pos) {
case FIELD_TYPE_TINY: case FIELD_TYPE_TINY:
item_param->set_int((longlong)(*pos)); param->setup_param_func= setup_param_tiny;
pos += 1; param->item_result_type = INT_RESULT;
break; break;
case FIELD_TYPE_SHORT: case FIELD_TYPE_SHORT:
item_param->set_int((longlong)sint2korr(pos)); param->setup_param_func= setup_param_short;
pos += 2; param->item_result_type = INT_RESULT;
break;
case FIELD_TYPE_INT24:
item_param->set_int((longlong)sint4korr(pos));
pos += 3;
break; break;
case FIELD_TYPE_LONG: case FIELD_TYPE_LONG:
item_param->set_int((longlong)sint4korr(pos)); param->setup_param_func= setup_param_int32;
pos += 4; param->item_result_type = INT_RESULT;
break; break;
case FIELD_TYPE_LONGLONG: case FIELD_TYPE_LONGLONG:
item_param->set_int((longlong)sint8korr(pos)); param->setup_param_func= setup_param_int64;
pos += 8; param->item_result_type = INT_RESULT;
break; break;
case FIELD_TYPE_FLOAT: case FIELD_TYPE_FLOAT:
float data; param->setup_param_func= setup_param_float;
float4get(data,pos); param->item_result_type = REAL_RESULT;
item_param->set_double((double) data);
pos += 4;
break; break;
case FIELD_TYPE_DOUBLE: case FIELD_TYPE_DOUBLE:
double j; param->setup_param_func= setup_param_double;
float8get(j,pos) param->item_result_type = REAL_RESULT;
item_param->set_double(j);
pos += 8;
break; break;
default: default:
{ param->setup_param_func= setup_param_str;
ulong len=get_param_length(&pos); param->item_result_type = STRING_RESULT;
item_param->set_value((const char*)pos,len,current_thd->thd_charset);
pos+=len;
}
} }
return(pos);
} }
/* /*
...@@ -283,42 +276,46 @@ static uchar* setup_param_field(Item_param *item_param, ...@@ -283,42 +276,46 @@ static uchar* setup_param_field(Item_param *item_param,
from client .. from client ..
*/ */
static bool setup_param_fields(THD *thd, PREP_STMT *stmt) static bool setup_params_data(PREP_STMT *stmt)
{ {
DBUG_ENTER("setup_param_fields"); THD *thd= stmt->thd;
#ifdef READY_TO_BE_USED List<Item> &params= thd->lex.param_list;
Item_param *item_param; List_iterator<Item> param_iterator(params);
ulong param_count=0; Item_param *param;
uchar *pos=(uchar*) thd->net.read_pos+1;// skip command type DBUG_ENTER("setup_params_data");
uchar *pos=(uchar*) thd->net.read_pos+1+MYSQL_STMT_HEADER; //skip header
uchar *read_pos= pos+(stmt->param_count+7) / 8; //skip null bits
ulong param_no;
if (*pos++) // No types supplied, read only param data if (*read_pos++) //types supplied / first execute
{ {
while ((item_param=(Item_param *)it++) && /*
(param_count++ < stmt->param_count)) First execute or types altered by the client, setup the
conversion routines for all parameters (one time)
*/
while ((param= (Item_param *)param_iterator++))
{ {
if (item_param->long_data_supplied) if (!param->long_data_supplied)
continue; {
setup_param_functions(param,*read_pos);
if (!(pos=setup_param_field(item_param,pos,item_param->buffer_type))) read_pos+= 2;
DBUG_RETURN(1); }
} }
param_iterator.rewind();
} }
else // Types supplied, read and store it along with param data param_no= 0;
while ((param= (Item_param *)param_iterator++))
{ {
while ((item_param=(Item_param *)it++) && if (!param->long_data_supplied)
(param_count++ < thd->param_count))
{ {
if (item_param->long_data_supplied) if (IS_PARAM_NULL(pos,param_no))
continue; param->maybe_null=param->null_value=1;
else
if (!(pos=setup_param_field(item_param,pos, param->setup_param_func(param,&read_pos);
item_param->buffer_type=
(enum_field_types) get_buffer_type(&pos))))
DBUG_RETURN(1);
} }
param_no++;
} }
#endif
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -379,8 +376,7 @@ static int check_prepare_fields(THD *thd,TABLE *table, List<Item> &fields, ...@@ -379,8 +376,7 @@ static int check_prepare_fields(THD *thd,TABLE *table, List<Item> &fields,
static bool mysql_test_insert_fields(PREP_STMT *stmt, static bool mysql_test_insert_fields(PREP_STMT *stmt,
TABLE_LIST *table_list, TABLE_LIST *table_list,
List<Item> &fields, List<Item> &fields,
List<List_item> &values_list, List<List_item> &values_list)
thr_lock_type lock_type)
{ {
THD *thd= stmt->thd; THD *thd= stmt->thd;
TABLE *table; TABLE *table;
...@@ -388,7 +384,7 @@ static bool mysql_test_insert_fields(PREP_STMT *stmt, ...@@ -388,7 +384,7 @@ static bool mysql_test_insert_fields(PREP_STMT *stmt,
List_item *values; List_item *values;
DBUG_ENTER("mysql_test_insert_fields"); DBUG_ENTER("mysql_test_insert_fields");
if (!(table = open_ltable(thd,table_list,lock_type))) if (!(table = open_ltable(thd,table_list,table_list->lock_type)))
DBUG_RETURN(1); DBUG_RETURN(1);
if ((values= its++)) if ((values= its++))
...@@ -431,13 +427,13 @@ static bool mysql_test_insert_fields(PREP_STMT *stmt, ...@@ -431,13 +427,13 @@ static bool mysql_test_insert_fields(PREP_STMT *stmt,
static bool mysql_test_upd_fields(PREP_STMT *stmt, TABLE_LIST *table_list, static bool mysql_test_upd_fields(PREP_STMT *stmt, TABLE_LIST *table_list,
List<Item> &fields, List<Item> &values, List<Item> &fields, List<Item> &values,
COND *conds, thr_lock_type lock_type) COND *conds)
{ {
THD *thd= stmt->thd; THD *thd= stmt->thd;
TABLE *table; TABLE *table;
DBUG_ENTER("mysql_test_upd_fields"); DBUG_ENTER("mysql_test_upd_fields");
if (!(table = open_ltable(thd,table_list,lock_type))) if (!(table = open_ltable(thd,table_list,table_list->lock_type)))
DBUG_RETURN(1); DBUG_RETURN(1);
if (setup_tables(table_list) || setup_fields(thd,table_list,fields,1,0,0) || if (setup_tables(table_list) || setup_fields(thd,table_list,fields,1,0,0) ||
...@@ -469,7 +465,7 @@ static bool mysql_test_upd_fields(PREP_STMT *stmt, TABLE_LIST *table_list, ...@@ -469,7 +465,7 @@ static bool mysql_test_upd_fields(PREP_STMT *stmt, TABLE_LIST *table_list,
static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables, static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables,
List<Item> &fields, List<Item> &values, List<Item> &fields, List<Item> &values,
COND *conds, ORDER *order, ORDER *group, COND *conds, ORDER *order, ORDER *group,
Item *having, thr_lock_type lock_type) Item *having)
{ {
TABLE *table; TABLE *table;
bool hidden_group_fields; bool hidden_group_fields;
...@@ -477,7 +473,7 @@ static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables, ...@@ -477,7 +473,7 @@ static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables,
List<Item> all_fields(fields); List<Item> all_fields(fields);
DBUG_ENTER("mysql_test_select_fields"); DBUG_ENTER("mysql_test_select_fields");
if (!(table = open_ltable(thd,tables,lock_type))) if (!(table = open_ltable(thd,tables,tables->lock_type)))
DBUG_RETURN(1); DBUG_RETURN(1);
thd->used_tables=0; // Updated by setup_fields thd->used_tables=0; // Updated by setup_fields
...@@ -550,21 +546,19 @@ static bool send_prepare_results(PREP_STMT *stmt) ...@@ -550,21 +546,19 @@ static bool send_prepare_results(PREP_STMT *stmt)
case SQLCOM_INSERT: case SQLCOM_INSERT:
if (mysql_test_insert_fields(stmt, tables, lex->field_list, if (mysql_test_insert_fields(stmt, tables, lex->field_list,
lex->many_values, lex->lock_option)) lex->many_values))
goto abort; goto abort;
break; break;
case SQLCOM_UPDATE: case SQLCOM_UPDATE:
if (mysql_test_upd_fields(stmt, tables, select_lex->item_list, if (mysql_test_upd_fields(stmt, tables, select_lex->item_list,
lex->value_list, select_lex->where, lex->value_list, select_lex->where))
lex->lock_option))
goto abort; goto abort;
break; break;
case SQLCOM_DELETE: case SQLCOM_DELETE:
if (mysql_test_upd_fields(stmt, tables, select_lex->item_list, if (mysql_test_upd_fields(stmt, tables, select_lex->item_list,
lex->value_list, select_lex->where, lex->value_list, select_lex->where))
lex->lock_option))
goto abort; goto abort;
break; break;
...@@ -572,8 +566,7 @@ static bool send_prepare_results(PREP_STMT *stmt) ...@@ -572,8 +566,7 @@ static bool send_prepare_results(PREP_STMT *stmt)
if (mysql_test_select_fields(stmt, tables, select_lex->item_list, if (mysql_test_select_fields(stmt, tables, select_lex->item_list,
lex->value_list, select_lex->where, lex->value_list, select_lex->where,
(ORDER*) select_lex->order_list.first, (ORDER*) select_lex->order_list.first,
(ORDER*) select_lex->group_list.first, (ORDER*) select_lex->group_list.first, select_lex->having))
select_lex->having, lex->lock_option))
goto abort; goto abort;
break; break;
...@@ -583,6 +576,8 @@ static bool send_prepare_results(PREP_STMT *stmt) ...@@ -583,6 +576,8 @@ static bool send_prepare_results(PREP_STMT *stmt)
Rest fall through to default category, no parsing Rest fall through to default category, no parsing
for non-DML statements for non-DML statements
*/ */
if (send_prep_stmt(stmt, 0))
goto abort;
} }
} }
DBUG_RETURN(0); DBUG_RETURN(0);
...@@ -607,6 +602,7 @@ static bool parse_prepare_query(PREP_STMT *stmt, ...@@ -607,6 +602,7 @@ static bool parse_prepare_query(PREP_STMT *stmt,
mysql_init_query(thd); mysql_init_query(thd);
thd->prepare_command=true; thd->prepare_command=true;
thd->safe_to_cache_query= 0; thd->safe_to_cache_query= 0;
thd->lex.param_count=0;
LEX *lex=lex_start(thd, (uchar*) packet, length); LEX *lex=lex_start(thd, (uchar*) packet, length);
if (!yyparse() && !thd->fatal_error) if (!yyparse() && !thd->fatal_error)
...@@ -615,6 +611,25 @@ static bool parse_prepare_query(PREP_STMT *stmt, ...@@ -615,6 +611,25 @@ static bool parse_prepare_query(PREP_STMT *stmt,
DBUG_RETURN(error); DBUG_RETURN(error);
} }
/*
Initialize parameter items in statement
*/
static bool init_param_items(THD *thd, PREP_STMT *stmt)
{
#if TO_BE_TESTED
Item_param **to;
if (!(to= (Item_param *)
my_malloc(sizeof(Item_param*) * stmt->param_count, MYF(MY_WME))))
return 1;
List<Item> &params= thd->lex.param_list;
List_iterator<Item> param_iterator(params);
while ((to++ = (Item_param *)param_iterator++))
{
DBUG_PRINT("info",("param: %lx", to));
}
return 0;
#endif
}
/* /*
Parse the query and send the total number of parameters Parse the query and send the total number of parameters
...@@ -649,9 +664,14 @@ bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length) ...@@ -649,9 +664,14 @@ bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length)
if (!(specialflag & SPECIAL_NO_PRIOR)) if (!(specialflag & SPECIAL_NO_PRIOR))
my_pthread_setprio(pthread_self(),WAIT_PRIOR); my_pthread_setprio(pthread_self(),WAIT_PRIOR);
#if 0
if (init_param_items(thd, &stmt))
goto err;
#endif
stmt.mem_root= thd->mem_root; stmt.mem_root= thd->mem_root;
tree_insert(&thd->prepared_statements, (void *)&stmt, 0, (void *)0);
thd->mem_root= thd_root; // restore main mem_root thd->mem_root= thd_root; // restore main mem_root
thd->last_prepared_stmt= &stmt;
DBUG_RETURN(0); DBUG_RETURN(0);
err: err:
...@@ -685,15 +705,13 @@ void mysql_stmt_execute(THD *thd, char *packet) ...@@ -685,15 +705,13 @@ void mysql_stmt_execute(THD *thd, char *packet)
/* Check if we got an error when sending long data */ /* Check if we got an error when sending long data */
if (stmt->error_in_prepare) if (stmt->error_in_prepare)
{ {
send_error(thd); send_error(thd, stmt->last_errno, stmt->last_error);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
if (stmt->param_count && setup_param_fields(thd, stmt)) if (stmt->param_count && setup_params_data(stmt))
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
MEM_ROOT thd_root= thd->mem_root;
thd->mem_root = thd->con_root;
if (!(specialflag & SPECIAL_NO_PRIOR)) if (!(specialflag & SPECIAL_NO_PRIOR))
my_pthread_setprio(pthread_self(),QUERY_PRIOR); my_pthread_setprio(pthread_self(),QUERY_PRIOR);
...@@ -703,12 +721,12 @@ void mysql_stmt_execute(THD *thd, char *packet) ...@@ -703,12 +721,12 @@ void mysql_stmt_execute(THD *thd, char *packet)
mysql_delete(), mysql_update() and mysql_select() to not to mysql_delete(), mysql_update() and mysql_select() to not to
have re-check on setup_* and other things .. have re-check on setup_* and other things ..
*/ */
mysql_execute_command(thd); mysql_execute_command(stmt->thd);
thd->last_prepared_stmt= stmt;
if (!(specialflag & SPECIAL_NO_PRIOR)) if (!(specialflag & SPECIAL_NO_PRIOR))
my_pthread_setprio(pthread_self(), WAIT_PRIOR); my_pthread_setprio(pthread_self(), WAIT_PRIOR);
thd->mem_root= thd_root;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -768,8 +786,10 @@ void mysql_stmt_close(THD *thd, char *packet) ...@@ -768,8 +786,10 @@ void mysql_stmt_close(THD *thd, char *packet)
send_error(thd); send_error(thd);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
stmt->param= 0;
my_free((char *)stmt->param, MYF(MY_ALLOW_ZERO_PTR));
/* Will call free_prep_stmt() */ /* Will call free_prep_stmt() */
tree_delete(&thd->prepared_statements, (void*) stmt, NULL); tree_delete(&thd->prepared_statements, (void*) &stmt, (void *)0);
thd->last_prepared_stmt=0; thd->last_prepared_stmt=0;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -800,17 +820,16 @@ void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length) ...@@ -800,17 +820,16 @@ void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length)
DBUG_ENTER("mysql_stmt_get_longdata"); DBUG_ENTER("mysql_stmt_get_longdata");
/* The following should never happen */ /* The following should never happen */
if (packet_length < 9) if (packet_length < MYSQL_LONG_DATA_HEADER+1)
{ {
my_error(ER_WRONG_ARGUMENTS, MYF(0), "get_longdata"); my_error(ER_WRONG_ARGUMENTS, MYF(0), "get_longdata");
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
pos++; // skip command type at first position
ulong stmt_id= uint4korr(pos); ulong stmt_id= uint4korr(pos);
uint param_number= uint2korr(pos+4); uint param_number= uint2korr(pos+4);
uint param_type= uint2korr(pos+6); uint param_type= uint2korr(pos+6);
pos+=8; // Point to data pos+=MYSQL_LONG_DATA_HEADER; // Point to data
if (!(stmt=find_prepared_statement(thd, stmt_id, "get_longdata"))) if (!(stmt=find_prepared_statement(thd, stmt_id, "get_longdata")))
{ {
...@@ -829,7 +848,8 @@ void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length) ...@@ -829,7 +848,8 @@ void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length)
sprintf(stmt->last_error, ER(ER_WRONG_ARGUMENTS), "get_longdata"); sprintf(stmt->last_error, ER(ER_WRONG_ARGUMENTS), "get_longdata");
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
stmt->param[param_number].set_longdata(pos, packet_length-9, current_thd->thd_charset); stmt->param[param_number].set_longdata(pos, packet_length-9);
stmt->long_data_used= 1; stmt->long_data_used= 1;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
tests/client_test.c
View file @ 4b85d31b
...@@ -48,15 +48,22 @@ ...@@ -48,15 +48,22 @@
#define false 0 #define false 0
#endif #endif
#ifndef bzero
#define bzero(A,B) memset(A,0,B)
#endif
/* set default options */ /* set default options */
static char *opt_db=(char *)"test"; static char *opt_db=0;
static char *opt_user=(char *)"root"; static char *opt_user=0;
static char *opt_password=(char *)""; static char *opt_password=0;
static char *opt_host=0; static char *opt_host=0;
static char *opt_unix_socket=0; static char *opt_unix_socket=0;
static uint opt_port; static uint opt_port;
static my_bool tty_password=0; static my_bool tty_password=0;
static MYSQL *mysql=0;
static char query[255];
#define myheader(str) { printf("\n\n#######################\n"); \ #define myheader(str) { printf("\n\n#######################\n"); \
printf("%s",str); \ printf("%s",str); \
printf("\n#######################\n"); \ printf("\n#######################\n"); \
...@@ -64,9 +71,9 @@ static my_bool tty_password=0; ...@@ -64,9 +71,9 @@ static my_bool tty_password=0;
#define init_bind(x) (bzero(x,sizeof(x))) #define init_bind(x) (bzero(x,sizeof(x)))
void print_error(MYSQL *mysql, const char *msg) void print_error(const char *msg)
{ {
if(mysql) if (mysql)
{ {
fprintf(stderr,"\n [MySQL]%s \n",mysql_error(mysql)); fprintf(stderr,"\n [MySQL]%s \n",mysql_error(mysql));
} }
...@@ -75,14 +82,14 @@ void print_error(MYSQL *mysql, const char *msg) ...@@ -75,14 +82,14 @@ void print_error(MYSQL *mysql, const char *msg)
void print_st_error(MYSQL_STMT *stmt, const char *msg) void print_st_error(MYSQL_STMT *stmt, const char *msg)
{ {
if(stmt) if (stmt)
{ {
fprintf(stderr,"\n [MySQL]%s \n",mysql_stmt_error(stmt)); fprintf(stderr,"\n [MySQL]%s \n",mysql_stmt_error(stmt));
} }
else if(msg) fprintf(stderr, "%s\n", msg); else if(msg) fprintf(stderr, "%s\n", msg);
} }
#define myerror(mysql, msg) print_error(mysql, msg) #define myerror(msg) print_error(msg)
#define mysterror(stmt, msg) print_st_error(stmt, msg) #define mysterror(stmt, msg) print_st_error(stmt, msg)
#define myassert(x) if(x) {\ #define myassert(x) if(x) {\
...@@ -94,17 +101,17 @@ void print_st_error(MYSQL_STMT *stmt, const char *msg) ...@@ -94,17 +101,17 @@ void print_st_error(MYSQL_STMT *stmt, const char *msg)
exit(1);\ exit(1);\
} }
#define myquery(mysql,r) \ #define myquery(r) \
if( r != 0) \ if( r != 0) \
{ \ { \
myerror(mysql,NULL); \ myerror(NULL); \
myassert(true);\ myassert(true);\
} }
#define myquery_r(mysql,r) \ #define myquery_r(r) \
if( r != 0) \ if( r != 0) \
{ \ { \
myerror(mysql,NULL); \ myerror(NULL); \
myassert_r(true);\ myassert_r(true);\
} }
...@@ -115,17 +122,17 @@ if( r != 0) \ ...@@ -115,17 +122,17 @@ if( r != 0) \
myassert(true);\ myassert(true);\
} }
#define myxquery(mysql,stmt) \ #define myxquery(stmt) \
if( stmt == 0) \ if( stmt == 0) \
{ \ { \
myerror(mysql,NULL); \ myerror(NULL); \
myassert(true);\ myassert(true);\
} }
#define myxquery_r(mysql,stmt) \ #define myxquery_r(stmt) \
if( stmt == 0) \ if( stmt == 0) \
{ \ { \
myerror(mysql,NULL); \ myerror(NULL); \
myassert_r(true);\ myassert_r(true);\
} \ } \
else myassert(true); else myassert(true);
...@@ -137,40 +144,37 @@ if( r != 0) \ ...@@ -137,40 +144,37 @@ if( r != 0) \
myassert_r(true);\ myassert_r(true);\
} }
#define mytest(mysql,x) if(!x) {myerror(mysql,NULL);myassert(true);} #define mytest(x) if(!x) {myerror(NULL);myassert(true);}
#define mytest_r(mysql,x) if(x) {myerror(mysql,NULL);myassert(true);} #define mytest_r(x) if(x) {myerror(NULL);myassert(true);}
/******************************************************** /********************************************************
* connect to the server * * connect to the server *
*********************************************************/ *********************************************************/
MYSQL *client_connect() static void client_connect()
{ {
MYSQL *mysql;
myheader("client_connect"); myheader("client_connect");
if(!(mysql = mysql_init(NULL))) if(!(mysql = mysql_init(NULL)))
{ {
myerror(NULL, "mysql_init() failed"); myerror("mysql_init() failed");
exit(0); exit(0);
} }
if (!(mysql_real_connect(mysql,opt_host,opt_user, if (!(mysql_real_connect(mysql,opt_host,opt_user,
opt_password, opt_db, opt_port, opt_password, opt_db ? opt_db:"test", opt_port,
opt_unix_socket, 0))) opt_unix_socket, 0)))
{ {
myerror(mysql, "connection failed"); myerror("connection failed");
exit(0); exit(0);
} }
/* set AUTOCOMMIT to ON*/ /* set AUTOCOMMIT to ON*/
mysql_autocommit(mysql, true); mysql_autocommit(mysql, true);
return(mysql);
} }
/******************************************************** /********************************************************
* close the connection * * close the connection *
*********************************************************/ *********************************************************/
void client_disconnect(MYSQL *mysql) void client_disconnect()
{ {
myheader("client_disconnect"); myheader("client_disconnect");
...@@ -180,39 +184,39 @@ void client_disconnect(MYSQL *mysql) ...@@ -180,39 +184,39 @@ void client_disconnect(MYSQL *mysql)
/******************************************************** /********************************************************
* query processing * * query processing *
*********************************************************/ *********************************************************/
void client_query(MYSQL *mysql) void client_query()
{ {
int rc; int rc;
myheader("client_query"); myheader("client_query");
rc = mysql_query(mysql,"DROP TABLE IF EXISTS myclient_test"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS myclient_test");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE myclient_test(id int primary key auto_increment,\ rc = mysql_query(mysql,"CREATE TABLE myclient_test(id int primary key auto_increment,\
name varchar(20))"); name varchar(20))");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE myclient_test(id int, name varchar(20))"); rc = mysql_query(mysql,"CREATE TABLE myclient_test(id int, name varchar(20))");
myquery_r(mysql,rc); myquery_r(rc);
rc = mysql_query(mysql,"INSERT INTO myclient_test(name) VALUES('mysql')"); rc = mysql_query(mysql,"INSERT INTO myclient_test(name) VALUES('mysql')");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO myclient_test(name) VALUES('monty')"); rc = mysql_query(mysql,"INSERT INTO myclient_test(name) VALUES('monty')");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO myclient_test(name) VALUES('venu')"); rc = mysql_query(mysql,"INSERT INTO myclient_test(name) VALUES('venu')");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO myclient_test(name) VALUES('deleted')"); rc = mysql_query(mysql,"INSERT INTO myclient_test(name) VALUES('deleted')");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"UPDATE myclient_test SET name='updated' WHERE name='deleted'"); rc = mysql_query(mysql,"UPDATE myclient_test SET name='updated' WHERE name='deleted'");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"UPDATE myclient_test SET id=3 WHERE name='updated'"); rc = mysql_query(mysql,"UPDATE myclient_test SET id=3 WHERE name='updated'");
myquery_r(mysql,rc); myquery_r(rc);
} }
/******************************************************** /********************************************************
...@@ -277,7 +281,7 @@ void my_print_result_metadata(MYSQL_RES *result) ...@@ -277,7 +281,7 @@ void my_print_result_metadata(MYSQL_RES *result)
/******************************************************** /********************************************************
* process the result set * * process the result set *
*********************************************************/ *********************************************************/
int my_process_result_set(MYSQL *mysql, MYSQL_RES *result) int my_process_result_set(MYSQL_RES *result)
{ {
MYSQL_ROW row; MYSQL_ROW row;
MYSQL_FIELD *field; MYSQL_FIELD *field;
...@@ -315,10 +319,44 @@ int my_process_result_set(MYSQL *mysql, MYSQL_RES *result) ...@@ -315,10 +319,44 @@ int my_process_result_set(MYSQL *mysql, MYSQL_RES *result)
return(row_count); return(row_count);
} }
static void verify_col_data(const char *table, const char *col, const char *exp_data)
{
MYSQL_STMT *stmt;
MYSQL_BIND bind[1];
char data[255];
int rc;
init_bind(bind);
bind[0].buffer_type=FIELD_TYPE_STRING;
bind[0].buffer= (char *)data;
bind[0].buffer_length= sizeof(data);
sprintf(query, "SELECT `%s` FROM `%s`", col, table);
printf("\n %s", query);
stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(stmt);
rc = mysql_bind_result(stmt,bind);
mystmt(stmt, rc);
rc = mysql_execute(stmt);
mystmt(stmt, rc);
rc = mysql_fetch(stmt);
mystmt(stmt,rc);
printf("\n data : %s (expected: %s)",data, exp_data);
assert(strcmp(data,exp_data)==0);
mysql_stmt_close(stmt);
}
/******************************************************** /********************************************************
* store result processing * * store result processing *
*********************************************************/ *********************************************************/
void client_store_result(MYSQL *mysql) void client_store_result()
{ {
MYSQL_RES *result; MYSQL_RES *result;
int rc; int rc;
...@@ -326,33 +364,33 @@ void client_store_result(MYSQL *mysql) ...@@ -326,33 +364,33 @@ void client_store_result(MYSQL *mysql)
myheader("client_store_result"); myheader("client_store_result");
rc = mysql_query(mysql, "SELECT * FROM myclient_test"); rc = mysql_query(mysql, "SELECT * FROM myclient_test");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
mysql_free_result(result); mysql_free_result(result);
} }
/******************************************************** /********************************************************
* use result processing * * use result processing *
*********************************************************/ *********************************************************/
void client_use_result(MYSQL *mysql) void client_use_result()
{ {
MYSQL_RES *result; MYSQL_RES *result;
int rc; int rc;
myheader("client_use_result"); myheader("client_use_result");
rc = mysql_query(mysql, "SELECT * FROM myclient_test"); rc = mysql_query(mysql, "SELECT * FROM myclient_test");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -360,7 +398,7 @@ void client_use_result(MYSQL *mysql) ...@@ -360,7 +398,7 @@ void client_use_result(MYSQL *mysql)
/******************************************************** /********************************************************
* query processing * * query processing *
*********************************************************/ *********************************************************/
void test_debug_example(MYSQL *mysql) void test_debug_example()
{ {
int rc; int rc;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -368,35 +406,35 @@ void test_debug_example(MYSQL *mysql) ...@@ -368,35 +406,35 @@ void test_debug_example(MYSQL *mysql)
myheader("test_debug_example"); myheader("test_debug_example");
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_debug_example"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_debug_example");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_debug_example(id int primary key auto_increment,\ rc = mysql_query(mysql,"CREATE TABLE test_debug_example(id int primary key auto_increment,\
name varchar(20),xxx int)"); name varchar(20),xxx int)");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO test_debug_example(name) VALUES('mysql')"); rc = mysql_query(mysql,"INSERT INTO test_debug_example(name) VALUES('mysql')");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"UPDATE test_debug_example SET name='updated' WHERE name='deleted'"); rc = mysql_query(mysql,"UPDATE test_debug_example SET name='updated' WHERE name='deleted'");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"SELECT * FROM test_debug_example"); rc = mysql_query(mysql,"SELECT * FROM test_debug_example");
myquery(mysql,rc); myquery(rc);
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
mysql_free_result(result); mysql_free_result(result);
rc = mysql_query(mysql,"DROP TABLE test_debug_example"); rc = mysql_query(mysql,"DROP TABLE test_debug_example");
myquery(mysql,rc); myquery(rc);
} }
/******************************************************** /********************************************************
* to test autocommit feature * * to test autocommit feature *
*********************************************************/ *********************************************************/
void test_tran_bdb(MYSQL *mysql) void test_tran_bdb()
{ {
MYSQL_RES *result; MYSQL_RES *result;
MYSQL_ROW row; MYSQL_ROW row;
...@@ -406,66 +444,66 @@ void test_tran_bdb(MYSQL *mysql) ...@@ -406,66 +444,66 @@ void test_tran_bdb(MYSQL *mysql)
/* set AUTOCOMMIT to OFF */ /* set AUTOCOMMIT to OFF */
rc = mysql_autocommit(mysql, false); rc = mysql_autocommit(mysql, false);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS my_demo_transaction"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS my_demo_transaction");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */ /* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
rc = mysql_query(mysql,"CREATE TABLE my_demo_transaction(col1 int ,col2 varchar(30)) TYPE = BDB"); rc = mysql_query(mysql,"CREATE TABLE my_demo_transaction(col1 int ,col2 varchar(30)) TYPE = BDB");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* insert a row and commit the transaction */ /* insert a row and commit the transaction */
rc = mysql_query(mysql,"INSERT INTO my_demo_transaction VALUES(10,'venu')"); rc = mysql_query(mysql,"INSERT INTO my_demo_transaction VALUES(10,'venu')");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* now insert the second row, and rollback the transaction */ /* now insert the second row, and rollback the transaction */
rc = mysql_query(mysql,"INSERT INTO my_demo_transaction VALUES(20,'mysql')"); rc = mysql_query(mysql,"INSERT INTO my_demo_transaction VALUES(20,'mysql')");
myquery(mysql,rc); myquery(rc);
rc = mysql_rollback(mysql); rc = mysql_rollback(mysql);
myquery(mysql,rc); myquery(rc);
/* delete first row, and rollback it */ /* delete first row, and rollback it */
rc = mysql_query(mysql,"DELETE FROM my_demo_transaction WHERE col1 = 10"); rc = mysql_query(mysql,"DELETE FROM my_demo_transaction WHERE col1 = 10");
myquery(mysql,rc); myquery(rc);
rc = mysql_rollback(mysql); rc = mysql_rollback(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM my_demo_transaction"); rc = mysql_query(mysql,"SELECT * FROM my_demo_transaction");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM my_demo_transaction"); rc = mysql_query(mysql,"SELECT * FROM my_demo_transaction");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
row = mysql_fetch_row(result); row = mysql_fetch_row(result);
mytest(mysql,row); mytest(row);
row = mysql_fetch_row(result); row = mysql_fetch_row(result);
mytest_r(mysql,row); mytest_r(row);
mysql_free_result(result); mysql_free_result(result);
mysql_autocommit(mysql,true); mysql_autocommit(mysql,true);
...@@ -474,7 +512,7 @@ void test_tran_bdb(MYSQL *mysql) ...@@ -474,7 +512,7 @@ void test_tran_bdb(MYSQL *mysql)
/******************************************************** /********************************************************
* to test autocommit feature * * to test autocommit feature *
*********************************************************/ *********************************************************/
void test_tran_innodb(MYSQL *mysql) void test_tran_innodb()
{ {
MYSQL_RES *result; MYSQL_RES *result;
MYSQL_ROW row; MYSQL_ROW row;
...@@ -484,65 +522,65 @@ void test_tran_innodb(MYSQL *mysql) ...@@ -484,65 +522,65 @@ void test_tran_innodb(MYSQL *mysql)
/* set AUTOCOMMIT to OFF */ /* set AUTOCOMMIT to OFF */
rc = mysql_autocommit(mysql, false); rc = mysql_autocommit(mysql, false);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS my_demo_transaction"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS my_demo_transaction");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */ /* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
rc = mysql_query(mysql,"CREATE TABLE my_demo_transaction(col1 int ,col2 varchar(30)) TYPE = InnoDB"); rc = mysql_query(mysql,"CREATE TABLE my_demo_transaction(col1 int ,col2 varchar(30)) TYPE = InnoDB");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* insert a row and commit the transaction */ /* insert a row and commit the transaction */
rc = mysql_query(mysql,"INSERT INTO my_demo_transaction VALUES(10,'venu')"); rc = mysql_query(mysql,"INSERT INTO my_demo_transaction VALUES(10,'venu')");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* now insert the second row, and rollback the transaction */ /* now insert the second row, and rollback the transaction */
rc = mysql_query(mysql,"INSERT INTO my_demo_transaction VALUES(20,'mysql')"); rc = mysql_query(mysql,"INSERT INTO my_demo_transaction VALUES(20,'mysql')");
myquery(mysql,rc); myquery(rc);
rc = mysql_rollback(mysql); rc = mysql_rollback(mysql);
myquery(mysql,rc); myquery(rc);
/* delete first row, and rollback it */ /* delete first row, and rollback it */
rc = mysql_query(mysql,"DELETE FROM my_demo_transaction WHERE col1 = 10"); rc = mysql_query(mysql,"DELETE FROM my_demo_transaction WHERE col1 = 10");
myquery(mysql,rc); myquery(rc);
rc = mysql_rollback(mysql); rc = mysql_rollback(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM my_demo_transaction"); rc = mysql_query(mysql,"SELECT * FROM my_demo_transaction");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM my_demo_transaction"); rc = mysql_query(mysql,"SELECT * FROM my_demo_transaction");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
row = mysql_fetch_row(result); row = mysql_fetch_row(result);
mytest(mysql,row); mytest(row);
row = mysql_fetch_row(result); row = mysql_fetch_row(result);
mytest_r(mysql,row); mytest_r(row);
mysql_free_result(result); mysql_free_result(result);
mysql_autocommit(mysql,true); mysql_autocommit(mysql,true);
...@@ -553,27 +591,26 @@ void test_tran_innodb(MYSQL *mysql) ...@@ -553,27 +591,26 @@ void test_tran_innodb(MYSQL *mysql)
To test simple prepares of all DML statements To test simple prepares of all DML statements
*********************************************************/ *********************************************************/
void test_prepare_simple(MYSQL *mysql) void test_prepare_simple()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query;
myheader("test_prepare_simple"); myheader("test_prepare_simple");
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_simple"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_simple");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_prepare_simple(id int, name varchar(50))"); rc = mysql_query(mysql,"CREATE TABLE test_prepare_simple(id int, name varchar(50))");
myquery(mysql,rc); myquery(rc);
/* alter table */ /* alter table */
query = "ALTER TABLE test_prepare_simple ADD new char(20)"; strcpy(query,"ALTER TABLE test_prepare_simple ADD new char(20)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout,"\n total parameters in alter:%d\n", param_count); fprintf(stdout,"\n total parameters in alter:%d\n", param_count);
...@@ -581,9 +618,9 @@ void test_prepare_simple(MYSQL *mysql) ...@@ -581,9 +618,9 @@ void test_prepare_simple(MYSQL *mysql)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
/* insert */ /* insert */
query = "INSERT INTO test_prepare_simple VALUES(?,?)"; strcpy(query,"INSERT INTO test_prepare_simple VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout,"\n total parameters in insert:%d\n", param_count); fprintf(stdout,"\n total parameters in insert:%d\n", param_count);
...@@ -591,9 +628,9 @@ void test_prepare_simple(MYSQL *mysql) ...@@ -591,9 +628,9 @@ void test_prepare_simple(MYSQL *mysql)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
/* update */ /* update */
query = "UPDATE test_prepare_simple SET id=? WHERE id=? AND name= ?"; strcpy(query,"UPDATE test_prepare_simple SET id=? WHERE id=? AND name= ?");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout,"\n total parameters in update:%d\n", param_count); fprintf(stdout,"\n total parameters in update:%d\n", param_count);
...@@ -601,9 +638,9 @@ void test_prepare_simple(MYSQL *mysql) ...@@ -601,9 +638,9 @@ void test_prepare_simple(MYSQL *mysql)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
/* delete */ /* delete */
query = "DELETE FROM test_prepare_simple WHERE id=10"; strcpy(query,"DELETE FROM test_prepare_simple WHERE id=10");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout,"\n total parameters in delete:%d\n", param_count); fprintf(stdout,"\n total parameters in delete:%d\n", param_count);
...@@ -614,9 +651,9 @@ void test_prepare_simple(MYSQL *mysql) ...@@ -614,9 +651,9 @@ void test_prepare_simple(MYSQL *mysql)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
/* delete */ /* delete */
query = "DELETE FROM test_prepare_simple WHERE id=?"; strcpy(query,"DELETE FROM test_prepare_simple WHERE id=?");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout,"\n total parameters in delete:%d\n", param_count); fprintf(stdout,"\n total parameters in delete:%d\n", param_count);
...@@ -627,9 +664,9 @@ void test_prepare_simple(MYSQL *mysql) ...@@ -627,9 +664,9 @@ void test_prepare_simple(MYSQL *mysql)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
/* select */ /* select */
query = "SELECT * FROM test_prepare_simple WHERE id=? AND name= ?"; strcpy(query,"SELECT * FROM test_prepare_simple WHERE id=? AND name= ?");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout,"\n total parameters in select:%d\n", param_count); fprintf(stdout,"\n total parameters in select:%d\n", param_count);
...@@ -639,35 +676,33 @@ void test_prepare_simple(MYSQL *mysql) ...@@ -639,35 +676,33 @@ void test_prepare_simple(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
} }
/******************************************************** /********************************************************
* to test simple prepare field results * * to test simple prepare field results *
*********************************************************/ *********************************************************/
void test_prepare_field_result(MYSQL *mysql) void test_prepare_field_result()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query;
myheader("test_prepare_field_result"); myheader("test_prepare_field_result");
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_field_result"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_field_result");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_prepare_field_result(id int, name varchar(50), extra int)"); rc = mysql_query(mysql,"CREATE TABLE test_prepare_field_result(id int, name varchar(50), extra int)");
myquery(mysql,rc); myquery(rc);
/* insert */ /* insert */
query = "SELECT id,name FROM test_prepare_field_result WHERE id=?"; strcpy(query,"SELECT id,name FROM test_prepare_field_result WHERE id=?");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout,"\n total parameters in insert:%d\n", param_count); fprintf(stdout,"\n total parameters in insert:%d\n", param_count);
...@@ -676,48 +711,47 @@ void test_prepare_field_result(MYSQL *mysql) ...@@ -676,48 +711,47 @@ void test_prepare_field_result(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
} }
/******************************************************** /********************************************************
* to test simple prepare field results * * to test simple prepare field results *
*********************************************************/ *********************************************************/
void test_prepare_syntax(MYSQL *mysql) void test_prepare_syntax()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc; int rc;
const char *query;
myheader("test_prepare_syntax"); myheader("test_prepare_syntax");
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_syntax"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_syntax");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_prepare_syntax(id int, name varchar(50), extra int)"); rc = mysql_query(mysql,"CREATE TABLE test_prepare_syntax(id int, name varchar(50), extra int)");
myquery(mysql,rc); myquery(rc);
query = "INSERT INTO test_prepare_syntax VALUES(?"; strcpy(query,"INSERT INTO test_prepare_syntax VALUES(?");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery_r(mysql,stmt); myxquery_r(stmt);
query = "SELECT id,name FROM test_prepare_syntax WHERE id=? AND WHERE"; strcpy(query,"SELECT id,name FROM test_prepare_syntax WHERE id=? AND WHERE");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery_r(mysql,stmt); myxquery_r(stmt);
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
} }
/******************************************************** /********************************************************
* to test simple prepare * * to test simple prepare *
*********************************************************/ *********************************************************/
void test_prepare(MYSQL *mysql) void test_prepare()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
...@@ -736,24 +770,24 @@ void test_prepare(MYSQL *mysql) ...@@ -736,24 +770,24 @@ void test_prepare(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql, true); rc = mysql_autocommit(mysql, true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS my_prepare"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS my_prepare");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE my_prepare(col1 tinyint,\ rc = mysql_query(mysql,"CREATE TABLE my_prepare(col1 tinyint,\
col2 varchar(50), col3 int,\ col2 varchar(50), col3 int,\
col4 smallint, col5 bigint, \ col4 smallint, col5 bigint, \
col6 float, col7 double )"); col6 float, col7 double )");
myquery(mysql,rc); myquery(rc);
/* insert by prepare */ /* insert by prepare */
strcpy(query,"INSERT INTO my_prepare VALUES(?,?,?,?,?,?,?)"); strcpy(query,"INSERT INTO my_prepare VALUES(?,?,?,?,?,?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
...@@ -765,6 +799,7 @@ void test_prepare(MYSQL *mysql) ...@@ -765,6 +799,7 @@ void test_prepare(MYSQL *mysql)
/* string */ /* string */
bind[1].buffer_type=FIELD_TYPE_STRING; bind[1].buffer_type=FIELD_TYPE_STRING;
bind[1].buffer=str_data; bind[1].buffer=str_data;
bind[1].buffer_length=sizeof(str_data);
/* integer */ /* integer */
bind[2].buffer_type=FIELD_TYPE_LONG; bind[2].buffer_type=FIELD_TYPE_LONG;
bind[2].buffer= (gptr)&int_data; bind[2].buffer= (gptr)&int_data;
...@@ -807,17 +842,17 @@ void test_prepare(MYSQL *mysql) ...@@ -807,17 +842,17 @@ void test_prepare(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM my_prepare"); rc = mysql_query(mysql,"SELECT * FROM my_prepare");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert((int)tiny_data == my_process_result_set(mysql,result)); assert((int)tiny_data == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -825,7 +860,7 @@ void test_prepare(MYSQL *mysql) ...@@ -825,7 +860,7 @@ void test_prepare(MYSQL *mysql)
/******************************************************** /********************************************************
* to test double comparision * * to test double comparision *
*********************************************************/ *********************************************************/
void test_double_compare(MYSQL *mysql) void test_double_compare()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
...@@ -838,24 +873,24 @@ void test_double_compare(MYSQL *mysql) ...@@ -838,24 +873,24 @@ void test_double_compare(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql, true); rc = mysql_autocommit(mysql, true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_double_compare"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_double_compare");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_double_compare(col1 tinyint,\ rc = mysql_query(mysql,"CREATE TABLE test_double_compare(col1 tinyint,\
col2 float, col3 double )"); col2 float, col3 double )");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO test_double_compare VALUES(1,10.2,34.5)"); rc = mysql_query(mysql,"INSERT INTO test_double_compare VALUES(1,10.2,34.5)");
myquery(mysql,rc); myquery(rc);
strcpy(query, "UPDATE test_double_compare SET col1=100 WHERE col1 = ? AND col2 = ? AND COL3 = ?"); strcpy(query, "UPDATE test_double_compare SET col1=100 WHERE col1 = ? AND col2 = ? AND COL3 = ?");
stmt = mysql_prepare(mysql,query, strlen(query)); stmt = mysql_prepare(mysql,query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in update:%d\n", param_count); fprintf(stdout," total parameters in update:%d\n", param_count);
...@@ -866,6 +901,7 @@ void test_double_compare(MYSQL *mysql) ...@@ -866,6 +901,7 @@ void test_double_compare(MYSQL *mysql)
/* string->float */ /* string->float */
bind[1].buffer_type=FIELD_TYPE_STRING; bind[1].buffer_type=FIELD_TYPE_STRING;
bind[1].buffer= (gptr)&real_data; bind[1].buffer= (gptr)&real_data;
bind[1].buffer_length=10;
/* double */ /* double */
bind[2].buffer_type=FIELD_TYPE_DOUBLE; bind[2].buffer_type=FIELD_TYPE_DOUBLE;
bind[2].buffer= (gptr)&double_data; bind[2].buffer= (gptr)&double_data;
...@@ -886,17 +922,17 @@ void test_double_compare(MYSQL *mysql) ...@@ -886,17 +922,17 @@ void test_double_compare(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM test_double_compare"); rc = mysql_query(mysql,"SELECT * FROM test_double_compare");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert((int)tiny_data == my_process_result_set(mysql,result)); assert((int)tiny_data == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -907,11 +943,10 @@ void test_double_compare(MYSQL *mysql) ...@@ -907,11 +943,10 @@ void test_double_compare(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple null * * to test simple null *
*********************************************************/ *********************************************************/
void test_null(MYSQL *mysql) void test_null()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query;
int nData=1; int nData=1;
MYSQL_RES *result; MYSQL_RES *result;
MYSQL_BIND bind[2]; MYSQL_BIND bind[2];
...@@ -920,29 +955,30 @@ void test_null(MYSQL *mysql) ...@@ -920,29 +955,30 @@ void test_null(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_null"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_null");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_null(col1 int,col2 varchar(50))"); rc = mysql_query(mysql,"CREATE TABLE test_null(col1 int,col2 varchar(50))");
myquery(mysql,rc); myquery(rc);
/* insert by prepare, wrong column name */ /* insert by prepare, wrong column name */
query = "INSERT INTO test_null(col3,col2) VALUES(?,?)"; strcpy(query,"INSERT INTO test_null(col3,col2) VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery_r(mysql,stmt); myxquery_r(stmt);
query = "INSERT INTO test_null(col1,col2) VALUES(?,?)"; strcpy(query,"INSERT INTO test_null(col1,col2) VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
assert(param_count == 2); assert(param_count == 2);
bind[0].is_null=1; bind[0].is_null=1;
bind[1].is_null=1; /* string data */ bind[0].buffer_type=MYSQL_TYPE_NULL;
bind[1]=bind[0]; /* string data */
rc = mysql_bind_param(stmt,bind); rc = mysql_bind_param(stmt,bind);
mystmt(stmt, rc); mystmt(stmt, rc);
...@@ -957,19 +993,18 @@ void test_null(MYSQL *mysql) ...@@ -957,19 +993,18 @@ void test_null(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM test_null"); rc = mysql_query(mysql,"SELECT * FROM test_null");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(nData == my_process_result_set(mysql,result)); assert(nData == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -977,7 +1012,7 @@ void test_null(MYSQL *mysql) ...@@ -977,7 +1012,7 @@ void test_null(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple select * * to test simple select *
*********************************************************/ *********************************************************/
void test_select_simple(MYSQL *mysql) void test_select_simple()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,length; int rc,length;
...@@ -986,11 +1021,10 @@ void test_select_simple(MYSQL *mysql) ...@@ -986,11 +1021,10 @@ void test_select_simple(MYSQL *mysql)
myheader("test_select_simple"); myheader("test_select_simple");
/* insert by prepare */ /* insert by prepare */
strcpy((char *)query, "SHOW TABLES FROM mysql"); strcpy((char *)query, "SHOW TABLES FROM mysql");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
length = mysql_param_count(stmt); length = mysql_param_count(stmt);
fprintf(stdout," total parameters in select:%d\n", length); fprintf(stdout," total parameters in select:%d\n", length);
...@@ -1001,22 +1035,24 @@ void test_select_simple(MYSQL *mysql) ...@@ -1001,22 +1035,24 @@ void test_select_simple(MYSQL *mysql)
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
mysql_free_result(result); mysql_free_result(result);
mysql_stmt_close(stmt);
#if 0 #if 0
strcpy((char *)query , "SELECT @@ VERSION"); strcpy((char *)query , "SELECT @@ VERSION");
length = strlen(query); length = strlen(query);
rc = mysql_query(mysql,query); rc = mysql_query(mysql,query);
mytest(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
mysql_free_result(result); mysql_free_result(result);
#endif #endif
} }
...@@ -1025,11 +1061,10 @@ void test_select_simple(MYSQL *mysql) ...@@ -1025,11 +1061,10 @@ void test_select_simple(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple select * * to test simple select *
*********************************************************/ *********************************************************/
void test_select(MYSQL *mysql) void test_select()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count=0; int rc,param_count=0;
const char *query;
char *szData=(char *)"updated-value"; char *szData=(char *)"updated-value";
int nData=1; int nData=1;
MYSQL_BIND bind[2]; MYSQL_BIND bind[2];
...@@ -1040,37 +1075,37 @@ void test_select(MYSQL *mysql) ...@@ -1040,37 +1075,37 @@ void test_select(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql,true); rc = mysql_autocommit(mysql,true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_select"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_select");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_select(id int,name varchar(50))"); rc = mysql_query(mysql,"CREATE TABLE test_select(id int,name varchar(50))");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* insert a row and commit the transaction */ /* insert a row and commit the transaction */
rc = mysql_query(mysql,"INSERT INTO test_select VALUES(10,'venu')"); rc = mysql_query(mysql,"INSERT INTO test_select VALUES(10,'venu')");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* now insert the second row, and rollback the transaction */ /* now insert the second row, and rollback the transaction */
rc = mysql_query(mysql,"INSERT INTO test_select VALUES(20,'mysql')"); rc = mysql_query(mysql,"INSERT INTO test_select VALUES(20,'mysql')");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
query = "SELECT * FROM test_select WHERE id=? AND name=?"; strcpy(query,"SELECT * FROM test_select WHERE id=? AND name=?");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in select:%d\n", param_count); fprintf(stdout," total parameters in select:%d\n", param_count);
...@@ -1081,6 +1116,7 @@ void test_select(MYSQL *mysql) ...@@ -1081,6 +1116,7 @@ void test_select(MYSQL *mysql)
szData=(char *)"venu"; szData=(char *)"venu";
bind[1].buffer_type=FIELD_TYPE_STRING; bind[1].buffer_type=FIELD_TYPE_STRING;
bind[1].buffer=szData; bind[1].buffer=szData;
bind[1].buffer_length=4;
bind[0].buffer=(gptr)&nData; bind[0].buffer=(gptr)&nData;
bind[0].buffer_type=FIELD_TYPE_LONG; bind[0].buffer_type=FIELD_TYPE_LONG;
...@@ -1092,9 +1128,9 @@ void test_select(MYSQL *mysql) ...@@ -1092,9 +1128,9 @@ void test_select(MYSQL *mysql)
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert( 1 == my_process_result_set(mysql,result)); assert( 1 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
...@@ -1108,48 +1144,46 @@ void test_select(MYSQL *mysql) ...@@ -1108,48 +1144,46 @@ void test_select(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple update * * to test simple update *
*********************************************************/ *********************************************************/
void test_simple_update(MYSQL *mysql) void test_simple_update()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query; char szData[25];
char *szData=(char *)"updated-value";
int nData=1; int nData=1;
MYSQL_RES *result; MYSQL_RES *result;
MYSQL_BIND bind[2]; MYSQL_BIND bind[2];
myheader("test_simple_update"); myheader("test_simple_update");
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql,true); rc = mysql_autocommit(mysql,true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_update"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_update");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_update(col1 int,\ rc = mysql_query(mysql,"CREATE TABLE test_update(col1 int,\
col2 varchar(50), col3 int )"); col2 varchar(50), col3 int )");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO test_update VALUES(1,'MySQL',100)"); rc = mysql_query(mysql,"INSERT INTO test_update VALUES(1,'MySQL',100)");
myquery(mysql,rc); myquery(rc);
assert(1 == mysql_affected_rows(mysql)); assert(1 == mysql_affected_rows(mysql));
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* insert by prepare */ /* insert by prepare */
query = "UPDATE test_update SET col2=? WHERE col1=?"; strcpy(query,"UPDATE test_update SET col2=? WHERE col1=?");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in update:%d\n", param_count); fprintf(stdout," total parameters in update:%d\n", param_count);
...@@ -1158,6 +1192,7 @@ void test_simple_update(MYSQL *mysql) ...@@ -1158,6 +1192,7 @@ void test_simple_update(MYSQL *mysql)
nData=1; nData=1;
bind[0].buffer_type=FIELD_TYPE_STRING; bind[0].buffer_type=FIELD_TYPE_STRING;
bind[0].buffer=szData; /* string data */ bind[0].buffer=szData; /* string data */
bind[0].buffer_length=sprintf(szData,"updated-data");
bind[1].buffer=(gptr)&nData; bind[1].buffer=(gptr)&nData;
bind[1].buffer_type=FIELD_TYPE_LONG; bind[1].buffer_type=FIELD_TYPE_LONG;
...@@ -1172,17 +1207,17 @@ void test_simple_update(MYSQL *mysql) ...@@ -1172,17 +1207,17 @@ void test_simple_update(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM test_update"); rc = mysql_query(mysql,"SELECT * FROM test_update");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(1 == my_process_result_set(mysql,result)); assert(1 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -1190,53 +1225,58 @@ void test_simple_update(MYSQL *mysql) ...@@ -1190,53 +1225,58 @@ void test_simple_update(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple long data handling * * to test simple long data handling *
*********************************************************/ *********************************************************/
void test_long_data(MYSQL *mysql) void test_long_data()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count, int_data=10;
const char *query;
char *data=NullS; char *data=NullS;
MYSQL_RES *result; MYSQL_RES *result;
MYSQL_BIND bind[2]; MYSQL_BIND bind[3];
myheader("test_long_data"); myheader("test_long_data");
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql,true); rc = mysql_autocommit(mysql,true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_long_data"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_long_data");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_long_data(col1 int,\ rc = mysql_query(mysql,"CREATE TABLE test_long_data(col1 int,\
col2 long varchar, col3 long varbinary)"); col2 long varchar, col3 long varbinary)");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
query = "INSERT INTO test_long_data(col2) VALUES(?)"; strcpy(query,"INSERT INTO test_long_data(col1,col2) VALUES(?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery_r(stmt);
strcpy(query,"INSERT INTO test_long_data(col1,col2,col3) VALUES(?,?,?)");
stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
assert(param_count == 1); assert(param_count == 3);
bind[0].buffer=data; /* string data */ bind[0].buffer=(char *)&int_data;
bind[0].is_long_data=1; /* specify long data suppy during run-time */ bind[0].buffer_type=FIELD_TYPE_LONG;
bind[1].is_long_data=1; /* specify long data suppy during run-time */
/* Non string or binary type, error */ /* Non string or binary type, error */
bind[0].buffer_type=FIELD_TYPE_LONG; bind[1].buffer_type=FIELD_TYPE_LONG;
rc = mysql_bind_param(stmt,bind); rc = mysql_bind_param(stmt,bind);
fprintf(stdout,"mysql_bind_param() returned %d\n",rc); fprintf(stdout,"mysql_bind_param() returned %d\n",rc);
mystmt_r(stmt, rc); mystmt_r(stmt, rc);
bind[0].buffer_type=FIELD_TYPE_STRING; bind[1].buffer_type=FIELD_TYPE_STRING;
bind[2]=bind[1];
rc = mysql_bind_param(stmt,bind); rc = mysql_bind_param(stmt,bind);
mystmt(stmt, rc); mystmt(stmt, rc);
...@@ -1247,7 +1287,7 @@ void test_long_data(MYSQL *mysql) ...@@ -1247,7 +1287,7 @@ void test_long_data(MYSQL *mysql)
data = (char *)"Micheal"; data = (char *)"Micheal";
/* supply data in pieces */ /* supply data in pieces */
rc = mysql_send_long_data(stmt,0,data,7,1); rc = mysql_send_long_data(stmt,1,data,7,1);
mystmt(stmt, rc); mystmt(stmt, rc);
/* try to execute mysql_execute() now, it should return /* try to execute mysql_execute() now, it should return
...@@ -1259,13 +1299,12 @@ void test_long_data(MYSQL *mysql) ...@@ -1259,13 +1299,12 @@ void test_long_data(MYSQL *mysql)
/* append data again ..*/ /* append data again ..*/
/* supply data in pieces */ /* Indicate end of data */
data = (char *)" 'monty' widenius"; data = (char *)" 'monty' widenius";
rc = mysql_send_long_data(stmt,0,data,17,0); rc = mysql_send_long_data(stmt,1,data,17,1);
mystmt(stmt, rc); mystmt(stmt, rc);
/* Indiate end of data supply */ rc = mysql_send_long_data(stmt,2,"Venu (venu@mysql.com",4,1);
rc = mysql_send_long_data(stmt,0,0,0,1);
mystmt(stmt, rc); mystmt(stmt, rc);
/* execute */ /* execute */
...@@ -1274,28 +1313,27 @@ void test_long_data(MYSQL *mysql) ...@@ -1274,28 +1313,27 @@ void test_long_data(MYSQL *mysql)
mystmt(stmt,rc); mystmt(stmt,rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_query(mysql,"SELECT col2 FROM test_long_data"); rc = mysql_query(mysql,"SELECT * FROM test_long_data");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(1 == my_process_result_set(mysql,result)); assert(1 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
/******************************************************** /********************************************************
* to test long data (string) handling * * to test long data (string) handling *
*********************************************************/ *********************************************************/
void test_long_data_str(MYSQL *mysql) void test_long_data_str()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query;
char data[255]; char data[255];
long length; long length;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -1306,23 +1344,23 @@ void test_long_data_str(MYSQL *mysql) ...@@ -1306,23 +1344,23 @@ void test_long_data_str(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql,true); rc = mysql_autocommit(mysql,true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_long_data_str"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_long_data_str");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_long_data_str(id int, longstr long varchar)"); rc = mysql_query(mysql,"CREATE TABLE test_long_data_str(id int, longstr long varchar)");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
query = "INSERT INTO test_long_data_str VALUES(?,?)"; strcpy(query,"INSERT INTO test_long_data_str VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
...@@ -1374,17 +1412,17 @@ void test_long_data_str(MYSQL *mysql) ...@@ -1374,17 +1412,17 @@ void test_long_data_str(MYSQL *mysql)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_query(mysql,"SELECT LENGTH(longstr), longstr FROM test_long_data_str"); rc = mysql_query(mysql,"SELECT LENGTH(longstr), longstr FROM test_long_data_str");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(1 == my_process_result_set(mysql,result)); assert(1 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -1392,11 +1430,10 @@ void test_long_data_str(MYSQL *mysql) ...@@ -1392,11 +1430,10 @@ void test_long_data_str(MYSQL *mysql)
/******************************************************** /********************************************************
* to test long data (string) handling * * to test long data (string) handling *
*********************************************************/ *********************************************************/
void test_long_data_str1(MYSQL *mysql) void test_long_data_str1()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query;
char *data=(char *)"MySQL AB"; char *data=(char *)"MySQL AB";
int length; int length;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -1407,23 +1444,23 @@ void test_long_data_str1(MYSQL *mysql) ...@@ -1407,23 +1444,23 @@ void test_long_data_str1(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql,true); rc = mysql_autocommit(mysql,true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_long_data_str"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_long_data_str");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_long_data_str(longstr long varchar,blb long varbinary)"); rc = mysql_query(mysql,"CREATE TABLE test_long_data_str(longstr long varchar,blb long varbinary)");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
query = "INSERT INTO test_long_data_str VALUES(?,?)"; strcpy(query,"INSERT INTO test_long_data_str VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
...@@ -1484,17 +1521,17 @@ void test_long_data_str1(MYSQL *mysql) ...@@ -1484,17 +1521,17 @@ void test_long_data_str1(MYSQL *mysql)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_query(mysql,"SELECT LENGTH(longstr),longstr,LENGTH(blb),blb FROM test_long_data_str"); rc = mysql_query(mysql,"SELECT LENGTH(longstr),longstr,LENGTH(blb),blb FROM test_long_data_str");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(1 == my_process_result_set(mysql,result)); assert(1 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -1502,11 +1539,10 @@ void test_long_data_str1(MYSQL *mysql) ...@@ -1502,11 +1539,10 @@ void test_long_data_str1(MYSQL *mysql)
/******************************************************** /********************************************************
* to test long data (binary) handling * * to test long data (binary) handling *
*********************************************************/ *********************************************************/
void test_long_data_bin(MYSQL *mysql) void test_long_data_bin()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query;
char data[255]; char data[255];
int length; int length;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -1517,23 +1553,23 @@ void test_long_data_bin(MYSQL *mysql) ...@@ -1517,23 +1553,23 @@ void test_long_data_bin(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql,true); rc = mysql_autocommit(mysql,true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_long_data_bin"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_long_data_bin");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_long_data_bin(id int, longbin long varbinary)"); rc = mysql_query(mysql,"CREATE TABLE test_long_data_bin(id int, longbin long varbinary)");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
query = "INSERT INTO test_long_data_bin VALUES(?,?)"; strcpy(query,"INSERT INTO test_long_data_bin VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
...@@ -1584,17 +1620,17 @@ void test_long_data_bin(MYSQL *mysql) ...@@ -1584,17 +1620,17 @@ void test_long_data_bin(MYSQL *mysql)
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_query(mysql,"SELECT LENGTH(longbin), longbin FROM test_long_data_bin"); rc = mysql_query(mysql,"SELECT LENGTH(longbin), longbin FROM test_long_data_bin");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(1 == my_process_result_set(mysql,result)); assert(1 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -1602,11 +1638,10 @@ void test_long_data_bin(MYSQL *mysql) ...@@ -1602,11 +1638,10 @@ void test_long_data_bin(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple delete * * to test simple delete *
*********************************************************/ *********************************************************/
void test_simple_delete(MYSQL *mysql) void test_simple_delete()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query;
char szData[30]={0}; char szData[30]={0};
int nData=1; int nData=1;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -1617,39 +1652,41 @@ void test_simple_delete(MYSQL *mysql) ...@@ -1617,39 +1652,41 @@ void test_simple_delete(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql,true); rc = mysql_autocommit(mysql,true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_simple_delete"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_simple_delete");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_simple_delete(col1 int,\ rc = mysql_query(mysql,"CREATE TABLE test_simple_delete(col1 int,\
col2 varchar(50), col3 int )"); col2 varchar(50), col3 int )");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO test_simple_delete VALUES(1,'MySQL',100)"); rc = mysql_query(mysql,"INSERT INTO test_simple_delete VALUES(1,'MySQL',100)");
myquery(mysql,rc); myquery(rc);
assert(1 == mysql_affected_rows(mysql)); assert(1 == mysql_affected_rows(mysql));
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* insert by prepare */ /* insert by prepare */
query = "DELETE FROM test_simple_delete WHERE col1=? AND col2=? AND col3=100"; strcpy(query,"DELETE FROM test_simple_delete WHERE col1=? AND col2=? AND col3=100");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in delete:%d\n", param_count); fprintf(stdout," total parameters in delete:%d\n", param_count);
assert(param_count == 2); assert(param_count == 2);
nData=1; nData=1;
strcpy(szData,"MySQL");
bind[1].buffer_length = 5;
bind[1].buffer_type=FIELD_TYPE_STRING; bind[1].buffer_type=FIELD_TYPE_STRING;
bind[1].buffer=szData; /* string data */ bind[1].buffer=szData; /* string data */
bind[0].buffer=(gptr)&nData; bind[0].buffer=(gptr)&nData;
...@@ -1658,9 +1695,6 @@ void test_simple_delete(MYSQL *mysql) ...@@ -1658,9 +1695,6 @@ void test_simple_delete(MYSQL *mysql)
rc = mysql_bind_param(stmt,bind); rc = mysql_bind_param(stmt,bind);
mystmt(stmt, rc); mystmt(stmt, rc);
strcpy(szData,"MySQL");
//bind[1].buffer_length = 5;
nData=1;
rc = mysql_execute(stmt); rc = mysql_execute(stmt);
mystmt(stmt, rc); mystmt(stmt, rc);
assert(1 == mysql_affected_rows(mysql)); assert(1 == mysql_affected_rows(mysql));
...@@ -1669,17 +1703,17 @@ void test_simple_delete(MYSQL *mysql) ...@@ -1669,17 +1703,17 @@ void test_simple_delete(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM test_simple_delete"); rc = mysql_query(mysql,"SELECT * FROM test_simple_delete");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(0 == my_process_result_set(mysql,result)); assert(0 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -1688,12 +1722,11 @@ void test_simple_delete(MYSQL *mysql) ...@@ -1688,12 +1722,11 @@ void test_simple_delete(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple update * * to test simple update *
*********************************************************/ *********************************************************/
void test_update(MYSQL *mysql) void test_update()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
const char *query; char szData[25];
char *szData=(char *)"updated-value";
int nData=1; int nData=1;
MYSQL_RES *result; MYSQL_RES *result;
MYSQL_BIND bind[2]; MYSQL_BIND bind[2];
...@@ -1703,33 +1736,33 @@ void test_update(MYSQL *mysql) ...@@ -1703,33 +1736,33 @@ void test_update(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_autocommit(mysql,true); rc = mysql_autocommit(mysql,true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_update"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_update");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_update(col1 int primary key auto_increment,\ rc = mysql_query(mysql,"CREATE TABLE test_update(col1 int primary key auto_increment,\
col2 varchar(50), col3 int )"); col2 varchar(50), col3 int )");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
query = "INSERT INTO test_update(col2,col3) VALUES(?,?)"; strcpy(query,"INSERT INTO test_update(col2,col3) VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
assert(param_count == 2); assert(param_count == 2);
/* string data */ /* string data */
szData=(char *)"inserted-data";
bind[0].buffer_type=FIELD_TYPE_STRING; bind[0].buffer_type=FIELD_TYPE_STRING;
bind[0].buffer=szData; bind[0].buffer=szData;
bind[0].buffer_length=sprintf(szData,"inserted-data");
bind[1].buffer=(gptr)&nData; bind[1].buffer=(gptr)&nData;
bind[1].buffer_type=FIELD_TYPE_LONG; bind[1].buffer_type=FIELD_TYPE_LONG;
...@@ -1743,23 +1776,22 @@ void test_update(MYSQL *mysql) ...@@ -1743,23 +1776,22 @@ void test_update(MYSQL *mysql)
assert(1 == mysql_affected_rows(mysql)); assert(1 == mysql_affected_rows(mysql));
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
/* insert by prepare */ strcpy(query,"UPDATE test_update SET col2=? WHERE col3=?");
query = "UPDATE test_update SET col2=? WHERE col3=?";
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in update:%d\n", param_count); fprintf(stdout," total parameters in update:%d\n", param_count);
assert(param_count == 2); assert(param_count == 2);
nData=100;szData=(char *)"updated-data"; nData=100;
bind[0].buffer_type=FIELD_TYPE_STRING; bind[0].buffer_type=FIELD_TYPE_STRING;
bind[0].buffer=szData; bind[0].buffer=szData;
bind[0].buffer_length=sprintf(szData,"updated-data");
bind[1].buffer=(gptr)&nData; bind[1].buffer=(gptr)&nData;
bind[1].buffer_type=FIELD_TYPE_LONG; bind[1].buffer_type=FIELD_TYPE_LONG;
rc = mysql_bind_param(stmt,bind); rc = mysql_bind_param(stmt,bind);
mystmt(stmt, rc); mystmt(stmt, rc);
...@@ -1771,17 +1803,17 @@ void test_update(MYSQL *mysql) ...@@ -1771,17 +1803,17 @@ void test_update(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM test_update"); rc = mysql_query(mysql,"SELECT * FROM test_update");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(1 == my_process_result_set(mysql,result)); assert(1 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -1789,29 +1821,28 @@ void test_update(MYSQL *mysql) ...@@ -1789,29 +1821,28 @@ void test_update(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple prepare * * to test simple prepare *
*********************************************************/ *********************************************************/
void test_init_prepare(MYSQL *mysql) void test_init_prepare()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int param_count, rc; int param_count, rc;
const char *query;
MYSQL_RES *result; MYSQL_RES *result;
myheader("test_init_prepare"); myheader("test_init_prepare");
rc = mysql_query(mysql,"DROP TABLE IF EXISTS my_prepare"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS my_prepare");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE my_prepare(col1 int ,col2 varchar(50))"); rc = mysql_query(mysql,"CREATE TABLE my_prepare(col1 int ,col2 varchar(50))");
myquery(mysql,rc); myquery(rc);
/* insert by prepare */ /* insert by prepare */
query = "INSERT INTO my_prepare VALUES(10,'venu')"; strcpy(query,"INSERT INTO my_prepare VALUES(10,'venu')");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
...@@ -1824,17 +1855,17 @@ void test_init_prepare(MYSQL *mysql) ...@@ -1824,17 +1855,17 @@ void test_init_prepare(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM my_prepare"); rc = mysql_query(mysql,"SELECT * FROM my_prepare");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(1 == my_process_result_set(mysql,result)); assert(1 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -1842,7 +1873,7 @@ void test_init_prepare(MYSQL *mysql) ...@@ -1842,7 +1873,7 @@ void test_init_prepare(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple bind result * * to test simple bind result *
*********************************************************/ *********************************************************/
void test_bind_result(MYSQL *mysql) void test_bind_result()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc; int rc;
...@@ -1855,25 +1886,25 @@ void test_bind_result(MYSQL *mysql) ...@@ -1855,25 +1886,25 @@ void test_bind_result(MYSQL *mysql)
init_bind(bind); init_bind(bind);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_bind_result"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_bind_result");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_bind_result(col1 int ,col2 varchar(50))"); rc = mysql_query(mysql,"CREATE TABLE test_bind_result(col1 int ,col2 varchar(50))");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO test_bind_result VALUES(10,'venu')"); rc = mysql_query(mysql,"INSERT INTO test_bind_result VALUES(10,'venu')");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"INSERT INTO test_bind_result VALUES(20,'MySQL')"); rc = mysql_query(mysql,"INSERT INTO test_bind_result VALUES(20,'MySQL')");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* fetch */ /* fetch */
...@@ -1881,10 +1912,11 @@ void test_bind_result(MYSQL *mysql) ...@@ -1881,10 +1912,11 @@ void test_bind_result(MYSQL *mysql)
bind[0].buffer= (gptr) &nData; /* integer data */ bind[0].buffer= (gptr) &nData; /* integer data */
bind[1].buffer_type=FIELD_TYPE_STRING; bind[1].buffer_type=FIELD_TYPE_STRING;
bind[1].buffer=szData; /* string data */ bind[1].buffer=szData; /* string data */
bind[1].buffer_length=sizeof(szData);
strcpy((char *)query , "SELECT * FROM test_bind_result"); strcpy((char *)query , "SELECT * FROM test_bind_result");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
rc = mysql_bind_result(stmt,bind); rc = mysql_bind_result(stmt,bind);
mystmt(stmt, rc); mystmt(stmt, rc);
...@@ -1915,11 +1947,11 @@ void test_bind_result(MYSQL *mysql) ...@@ -1915,11 +1947,11 @@ void test_bind_result(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple prepare with all possible types * * to test simple prepare with all possible types *
*********************************************************/ *********************************************************/
void test_prepare_ext(MYSQL *mysql) void test_prepare_ext()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
char *query; char *sql;
int nData=1; int nData=1;
MYSQL_RES *result; MYSQL_RES *result;
char tData=1; char tData=1;
...@@ -1927,18 +1959,17 @@ void test_prepare_ext(MYSQL *mysql) ...@@ -1927,18 +1959,17 @@ void test_prepare_ext(MYSQL *mysql)
longlong bData=20; longlong bData=20;
MYSQL_BIND bind_int[6]; MYSQL_BIND bind_int[6];
myheader("test_prepare_ext"); myheader("test_prepare_ext");
init_bind(bind_int); init_bind(bind_int);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_ext"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_ext");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
query = (char *)"CREATE TABLE test_prepare_ext\ sql = (char *)"CREATE TABLE test_prepare_ext\
(\ (\
c1 tinyint,\ c1 tinyint,\
c2 smallint,\ c2 smallint,\
...@@ -1973,13 +2004,13 @@ void test_prepare_ext(MYSQL *mysql) ...@@ -1973,13 +2004,13 @@ void test_prepare_ext(MYSQL *mysql)
c31 enum('one','two','three'),\ c31 enum('one','two','three'),\
c32 set('monday','tuesday','wednesday'))"; c32 set('monday','tuesday','wednesday'))";
rc = mysql_query(mysql,query); rc = mysql_query(mysql,sql);
myquery(mysql,rc); myquery(rc);
/* insert by prepare - all integers */ /* insert by prepare - all integers */
query = (char *)"INSERT INTO test_prepare_ext(c1,c2,c3,c4,c5,c6) VALUES(?,?,?,?,?,?)"; strcpy(query,(char *)"INSERT INTO test_prepare_ext(c1,c2,c3,c4,c5,c6) VALUES(?,?,?,?,?,?)");
stmt = mysql_prepare(mysql,query, strlen(query)); stmt = mysql_prepare(mysql,query, strlen(query));
myquery(mysql,rc); myquery(rc);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
...@@ -2024,17 +2055,17 @@ void test_prepare_ext(MYSQL *mysql) ...@@ -2024,17 +2055,17 @@ void test_prepare_ext(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT c1,c2,c3,c4,c5,c6 FROM test_prepare_ext"); rc = mysql_query(mysql,"SELECT c1,c2,c3,c4,c5,c6 FROM test_prepare_ext");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(nData == my_process_result_set(mysql,result)); assert(nData == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -2044,7 +2075,7 @@ void test_prepare_ext(MYSQL *mysql) ...@@ -2044,7 +2075,7 @@ void test_prepare_ext(MYSQL *mysql)
/******************************************************** /********************************************************
* to test real and alias names * * to test real and alias names *
*********************************************************/ *********************************************************/
void test_field_names(MYSQL *mysql) void test_field_names()
{ {
int rc; int rc;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -2053,48 +2084,48 @@ void test_field_names(MYSQL *mysql) ...@@ -2053,48 +2084,48 @@ void test_field_names(MYSQL *mysql)
printf("\n%d,%d,%d",MYSQL_TYPE_DECIMAL,MYSQL_TYPE_NEWDATE,MYSQL_TYPE_ENUM); printf("\n%d,%d,%d",MYSQL_TYPE_DECIMAL,MYSQL_TYPE_NEWDATE,MYSQL_TYPE_ENUM);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_field_names1"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_field_names1");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_field_names2"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_field_names2");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_field_names1(id int,name varchar(50))"); rc = mysql_query(mysql,"CREATE TABLE test_field_names1(id int,name varchar(50))");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_field_names2(id int,name varchar(50))"); rc = mysql_query(mysql,"CREATE TABLE test_field_names2(id int,name varchar(50))");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* with table name included with true column name */ /* with table name included with true column name */
rc = mysql_query(mysql,"SELECT id as 'id-alias' FROM test_field_names1"); rc = mysql_query(mysql,"SELECT id as 'id-alias' FROM test_field_names1");
myquery(mysql,rc); myquery(rc);
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
assert(0 == my_process_result_set(mysql,result)); assert(0 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
/* with table name included with true column name */ /* with table name included with true column name */
rc = mysql_query(mysql,"SELECT t1.id as 'id-alias',test_field_names2.name FROM test_field_names1 t1,test_field_names2"); rc = mysql_query(mysql,"SELECT t1.id as 'id-alias',test_field_names2.name FROM test_field_names1 t1,test_field_names2");
myquery(mysql,rc); myquery(rc);
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
assert(0 == my_process_result_set(mysql,result)); assert(0 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
/******************************************************** /********************************************************
* to test warnings * * to test warnings *
*********************************************************/ *********************************************************/
void test_warnings(MYSQL *mysql) void test_warnings()
{ {
int rc; int rc;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -2102,22 +2133,22 @@ void test_warnings(MYSQL *mysql) ...@@ -2102,22 +2133,22 @@ void test_warnings(MYSQL *mysql)
myheader("test_warnings"); myheader("test_warnings");
rc = mysql_query(mysql,"USE test"); rc = mysql_query(mysql,"USE test");
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"SHOW WARNINGS"); rc = mysql_query(mysql,"SHOW WARNINGS");
myquery(mysql,rc); myquery(rc);
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
mysql_free_result(result); mysql_free_result(result);
} }
/******************************************************** /********************************************************
* to test errors * * to test errors *
*********************************************************/ *********************************************************/
void test_errors(MYSQL *mysql) void test_errors()
{ {
int rc; int rc;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -2125,12 +2156,12 @@ void test_errors(MYSQL *mysql) ...@@ -2125,12 +2156,12 @@ void test_errors(MYSQL *mysql)
myheader("test_errors"); myheader("test_errors");
rc = mysql_query(mysql,"SHOW ERRORS"); rc = mysql_query(mysql,"SHOW ERRORS");
myquery(mysql,rc); myquery(rc);
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
my_process_result_set(mysql,result); my_process_result_set(result);
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -2139,10 +2170,10 @@ void test_errors(MYSQL *mysql) ...@@ -2139,10 +2170,10 @@ void test_errors(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple prepare-insert * * to test simple prepare-insert *
*********************************************************/ *********************************************************/
void test_insert(MYSQL *mysql) void test_insert()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count, length;
char query[200]; char query[200];
char str_data[50]; char str_data[50];
char tiny_data; char tiny_data;
...@@ -2152,23 +2183,23 @@ void test_insert(MYSQL *mysql) ...@@ -2152,23 +2183,23 @@ void test_insert(MYSQL *mysql)
myheader("test_insert"); myheader("test_insert");
rc = mysql_autocommit(mysql, true); rc = mysql_autocommit(mysql, true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prep_insert"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prep_insert");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_prep_insert(col1 tinyint,\ rc = mysql_query(mysql,"CREATE TABLE test_prep_insert(col1 tinyint,\
col2 varchar(50))"); col2 varchar(50))");
myquery(mysql,rc); myquery(rc);
/* insert by prepare */ /* insert by prepare */
bzero(bind, sizeof(bind)); bzero(bind, sizeof(bind));
strcpy(query,"INSERT INTO test_prep_insert VALUES(?,?)"); strcpy(query,"INSERT INTO test_prep_insert VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
...@@ -2180,6 +2211,7 @@ void test_insert(MYSQL *mysql) ...@@ -2180,6 +2211,7 @@ void test_insert(MYSQL *mysql)
/* string */ /* string */
bind[1].buffer_type=FIELD_TYPE_STRING; bind[1].buffer_type=FIELD_TYPE_STRING;
bind[1].buffer=str_data; bind[1].buffer=str_data;
bind[1].length=(long *)&length;
rc = mysql_bind_param(stmt,bind); rc = mysql_bind_param(stmt,bind);
mystmt(stmt, rc); mystmt(stmt, rc);
...@@ -2187,7 +2219,7 @@ void test_insert(MYSQL *mysql) ...@@ -2187,7 +2219,7 @@ void test_insert(MYSQL *mysql)
/* now, execute the prepared statement to insert 10 records.. */ /* now, execute the prepared statement to insert 10 records.. */
for (tiny_data=0; tiny_data < 3; tiny_data++) for (tiny_data=0; tiny_data < 3; tiny_data++)
{ {
bind[1].buffer_length = sprintf(str_data,"MySQL%d",tiny_data); length = sprintf(str_data,"MySQL%d",tiny_data);
rc = mysql_execute(stmt); rc = mysql_execute(stmt);
mystmt(stmt, rc); mystmt(stmt, rc);
} }
...@@ -2196,17 +2228,17 @@ void test_insert(MYSQL *mysql) ...@@ -2196,17 +2228,17 @@ void test_insert(MYSQL *mysql)
/* now fetch the results ..*/ /* now fetch the results ..*/
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* test the results now, only one row should exists */ /* test the results now, only one row should exists */
rc = mysql_query(mysql,"SELECT * FROM test_prep_insert"); rc = mysql_query(mysql,"SELECT * FROM test_prep_insert");
myquery(mysql,rc); myquery(rc);
/* get the result */ /* get the result */
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert((int)tiny_data == my_process_result_set(mysql,result)); assert((int)tiny_data == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
} }
...@@ -2214,7 +2246,7 @@ void test_insert(MYSQL *mysql) ...@@ -2214,7 +2246,7 @@ void test_insert(MYSQL *mysql)
/******************************************************** /********************************************************
* to test simple prepare-resultset info * * to test simple prepare-resultset info *
*********************************************************/ *********************************************************/
void test_prepare_resultset(MYSQL *mysql) void test_prepare_resultset()
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc,param_count; int rc,param_count;
...@@ -2224,29 +2256,29 @@ void test_prepare_resultset(MYSQL *mysql) ...@@ -2224,29 +2256,29 @@ void test_prepare_resultset(MYSQL *mysql)
myheader("test_prepare_resultset"); myheader("test_prepare_resultset");
rc = mysql_autocommit(mysql, true); rc = mysql_autocommit(mysql, true);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_resultset"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_prepare_resultset");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_prepare_resultset(id int,\ rc = mysql_query(mysql,"CREATE TABLE test_prepare_resultset(id int,\
name varchar(50),extra double)"); name varchar(50),extra double)");
myquery(mysql,rc); myquery(rc);
/* insert by prepare */ /* insert by prepare */
strcpy(query,"INSERT INTO test_prepare_resultset(id,name) VALUES(?,?)"); strcpy(query,"INSERT INTO test_prepare_resultset(id,name) VALUES(?,?)");
stmt = mysql_prepare(mysql, query, strlen(query)); stmt = mysql_prepare(mysql, query, strlen(query));
myxquery(mysql,stmt); myxquery(stmt);
param_count = mysql_param_count(stmt); param_count = mysql_param_count(stmt);
fprintf(stdout," total parameters in insert:%d\n", param_count); fprintf(stdout," total parameters in insert:%d\n", param_count);
assert(param_count == 2); assert(param_count == 2);
rc = mysql_query(mysql,"SELECT * FROM test_prepare_resultset"); rc = mysql_query(mysql,"SELECT * FROM test_prepare_resultset");
myquery(mysql,rc); myquery(rc);
/* get the prepared-result */ /* get the prepared-result */
result = mysql_prepare_result(stmt); result = mysql_prepare_result(stmt);
...@@ -2256,9 +2288,9 @@ void test_prepare_resultset(MYSQL *mysql) ...@@ -2256,9 +2288,9 @@ void test_prepare_resultset(MYSQL *mysql)
mysql_free_result(result); mysql_free_result(result);
result = mysql_store_result(mysql); result = mysql_store_result(mysql);
mytest(mysql,result); mytest(result);
assert(0 == my_process_result_set(mysql,result)); assert(0 == my_process_result_set(result));
mysql_free_result(result); mysql_free_result(result);
/* get the prepared-result */ /* get the prepared-result */
...@@ -2275,7 +2307,7 @@ void test_prepare_resultset(MYSQL *mysql) ...@@ -2275,7 +2307,7 @@ void test_prepare_resultset(MYSQL *mysql)
* to test field flags (verify .NET provider) * * to test field flags (verify .NET provider) *
*********************************************************/ *********************************************************/
void test_field_flags(MYSQL *mysql) void test_field_flags()
{ {
int rc; int rc;
MYSQL_RES *result; MYSQL_RES *result;
...@@ -2286,10 +2318,10 @@ void test_field_flags(MYSQL *mysql) ...@@ -2286,10 +2318,10 @@ void test_field_flags(MYSQL *mysql)
myheader("test_field_flags"); myheader("test_field_flags");
rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_field_flags"); rc = mysql_query(mysql,"DROP TABLE IF EXISTS test_field_flags");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
rc = mysql_query(mysql,"CREATE TABLE test_field_flags(id int NOT NULL AUTO_INCREMENT PRIMARY KEY,\ rc = mysql_query(mysql,"CREATE TABLE test_field_flags(id int NOT NULL AUTO_INCREMENT PRIMARY KEY,\
id1 int NOT NULL,\ id1 int NOT NULL,\
...@@ -2298,17 +2330,17 @@ void test_field_flags(MYSQL *mysql) ...@@ -2298,17 +2330,17 @@ void test_field_flags(MYSQL *mysql)
id4 int NOT NULL,\ id4 int NOT NULL,\
id5 int,\ id5 int,\
KEY(id3,id4))"); KEY(id3,id4))");
myquery(mysql,rc); myquery(rc);
rc = mysql_commit(mysql); rc = mysql_commit(mysql);
myquery(mysql,rc); myquery(rc);
/* with table name included with true column name */ /* with table name included with true column name */
rc = mysql_query(mysql,"SELECT * FROM test_field_flags"); rc = mysql_query(mysql,"SELECT * FROM test_field_flags");
myquery(mysql,rc); myquery(rc);
result = mysql_use_result(mysql); result = mysql_use_result(mysql);
mytest(mysql,result); mytest(result);
mysql_field_seek(result,0); mysql_field_seek(result,0);
fputc('\n', stdout); fputc('\n', stdout);
...@@ -2338,17 +2370,19 @@ static struct my_option myctest_long_options[] = ...@@ -2338,17 +2370,19 @@ static struct my_option myctest_long_options[] =
0, 0, 0, 0, 0}, 0, 0, 0, 0, 0},
{"database", 'D', "Database to use", (gptr*) &opt_db, (gptr*) &opt_db, {"database", 'D', "Database to use", (gptr*) &opt_db, (gptr*) &opt_db,
0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"host", 'h', "Connect to host", (gptr*) &opt_host, (gptr*) &opt_host, 0, GET_STR, {"host", 'h', "Connect to host", (gptr*) &opt_host, (gptr*) &opt_host, 0, GET_STR_ALLOC,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"password", 'p', {"password", 'p',
"Password to use when connecting to server. If password is not given it's asked from the tty.", "Password to use when connecting to server. If password is not given it's asked from the tty.",
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#ifndef DONT_ALLOW_USER_CHANGE
{"user", 'u', "User for login if not current user", (gptr*) &opt_user, {"user", 'u', "User for login if not current user", (gptr*) &opt_user,
(gptr*) &opt_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, (gptr*) &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif
{"port", 'P', "Port number to use for connection", (gptr*) &opt_port, {"port", 'P', "Port number to use for connection", (gptr*) &opt_port,
(gptr*) &opt_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, (gptr*) &opt_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"socket", 'S', "Socket file to use for connection", (gptr*) &opt_unix_socket, {"socket", 'S', "Socket file to use for connection", (gptr*) &opt_unix_socket,
(gptr*) &opt_unix_socket, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, (gptr*) &opt_unix_socket, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
}; };
...@@ -2392,9 +2426,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -2392,9 +2426,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case 'p': case 'p':
if (argument) if (argument)
{ {
char *start=argument;
my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR)); my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR));
opt_password= my_strdup(argument, MYF(MY_FAE)); opt_password= my_strdup(argument, MYF(MY_FAE));
while (*argument) *argument++= 'x'; /* Destroy argument */ while (*argument) *argument++= 'x'; /* Destroy argument */
if (*start)
start[1]=0;
} }
else else
tty_password= 1; tty_password= 1;
...@@ -2402,7 +2439,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -2402,7 +2439,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case '?': case '?':
case 'I': /* Info */ case 'I': /* Info */
usage(); usage();
exit(1); exit(0);
break; break;
} }
return 0; return 0;
...@@ -2416,11 +2453,11 @@ static void get_options(int argc, char **argv) ...@@ -2416,11 +2453,11 @@ static void get_options(int argc, char **argv)
load_defaults("my",load_default_groups,&argc,&argv); load_defaults("my",load_default_groups,&argc,&argv);
if ((ho_error=handle_options(&argc, &argv, myctest_long_options, if ((ho_error=handle_options(&argc,&argv, myctest_long_options,
get_one_option))) get_one_option)))
exit(ho_error); exit(ho_error);
free_defaults(argv); /*free_defaults(argv);*/
if (tty_password) if (tty_password)
opt_password=get_tty_password(NullS); opt_password=get_tty_password(NullS);
return; return;
...@@ -2431,46 +2468,49 @@ static void get_options(int argc, char **argv) ...@@ -2431,46 +2468,49 @@ static void get_options(int argc, char **argv)
*********************************************************/ *********************************************************/
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
MYSQL *mysql;
MY_INIT(argv[0]); MY_INIT(argv[0]);
get_options(argc,argv); /* don't work -- options : TODO */ get_options(argc,argv);
mysql = client_connect(); /* connect to server */ client_connect(); /* connect to server */
test_select(mysql); /* simple prepare-select */ test_null(); /* test null data handling */
test_insert(mysql); /* prepare with insert */ test_simple_update();
test_bind_result(mysql); /* result bind test */ //test_select_simple();
test_prepare(mysql); /* prepare test */ //test_prepare_resultset();
test_prepare_simple(mysql);/* simple prepare */ //test_select(); /* simple prepare-select */
test_null(mysql); /* test null data handling */ test_insert(); /* prepare with insert */
test_debug_example(mysql); /* some debugging case */ //test_bind_result(); /* result bind test */
test_update(mysql); /* prepare-update test */ //test_long_data(); /* long data handling in pieces */
test_simple_update(mysql); /* simple prepare with update */ test_prepare_simple();/* simple prepare */
test_long_data(mysql); /* long data handling in pieces */ test_prepare(); /* prepare test */
test_simple_delete(mysql); /* prepare with delete */ test_prepare_simple();/* simple prepare */
test_field_names(mysql); /* test for field names */ test_null(); /* test null data handling */
test_double_compare(mysql);/* float comparision */ test_debug_example(); /* some debugging case */
client_query(mysql); /* simple client query test */ test_update(); /* prepare-update test */
client_store_result(mysql);/* usage of mysql_store_result() */ test_simple_update(); /* simple prepare with update */
client_use_result(mysql); /* usage of mysql_use_result() */ //test_long_data(); /* long data handling in pieces */
test_tran_bdb(mysql); /* transaction test on BDB table type */ test_simple_delete(); /* prepare with delete */
test_tran_innodb(mysql); /* transaction test on InnoDB table type */ test_field_names(); /* test for field names */
test_prepare_ext(mysql); /* test prepare with all types conversion -- TODO */ test_double_compare();/* float comparision */
test_prepare_syntax(mysql);/* syntax check for prepares */ client_query(); /* simple client query test */
test_prepare_field_result(mysql); /* prepare meta info */ client_store_result();/* usage of mysql_store_result() */
test_field_names(mysql); /* test for field names */ client_use_result(); /* usage of mysql_use_result() */
test_field_flags(mysql); /* test to help .NET provider team */ test_tran_bdb(); /* transaction test on BDB table type */
test_long_data_str(mysql); /* long data handling */ test_tran_innodb(); /* transaction test on InnoDB table type */
test_long_data_str1(mysql);/* yet another long data handling */ test_prepare_ext(); /* test prepare with all types conversion -- TODO */
test_long_data_bin(mysql); /* long binary insertion */ test_prepare_syntax();/* syntax check for prepares */
test_warnings(mysql); /* show warnings test */ //test_prepare_field_result(); /* prepare meta info */
test_errors(mysql); /* show errors test */ test_field_names(); /* test for field names */
test_select_simple(mysql); /* simple select prepare */ test_field_flags(); /* test to help .NET provider team */
test_prepare_resultset(mysql);/* prepare meta info test */ //test_long_data_str(); /* long data handling */
//test_long_data_str1();/* yet another long data handling */
client_disconnect(mysql); /* disconnect from server */ //test_long_data_bin(); /* long binary insertion */
test_warnings(); /* show warnings test */
test_errors(); /* show errors test */
//test_select_simple(); /* simple select prepare */
//test_prepare_resultset();/* prepare meta info test */
client_disconnect(); /* disconnect from server */
fprintf(stdout,"\ndone !!!\n"); fprintf(stdout,"\ndone !!!\n");
return(0); return(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7