database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

SCRUM:

Browse Source 
#977 Prepared statements in embedded library


include/mysql.h:
  read_prepare_result function moved to 'virtual'
libmysql/client_settings.h:
  declare proper function for libmysql
libmysql/libmysql.c:
  some code moved from implementation of read_prepare_result to 
  mysql_prepare_result to make creating separate (remote and embedded-server)
  versions easier
libmysqld/libmysqld.c:
  emb_read_prepare_result prototype
sql-common/client.c:
  cli_read_prepare_result added to the client_methods
sql/client_settings.h:
  we don't need prepared statements in mini_client
sql/sql_prepare.cc:
  embedded send_prep_stmt added
This commit is contained in:
unknown
2003-09-12 19:35:34 +05:00
parent d6f15e9d02
commit dc250a6efc
7 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysql/client_settings.h
View File

@ -42,4 +42,5 @@ my_bool send_file_to_server(MYSQL *mysql, const char *filename);
#endif
MYSQL_RES * STDCALL cli_list_fields(MYSQL *mysql, const char *table, const char *wild);
my_bool cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt);

24
libmysql/libmysql.c
View File

@ -1556,13 +1556,13 @@ static my_bool my_realloc_str(NET *net, ulong length)
1 error
*/
static my_bool read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
my_bool STDCALL cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
{
uchar *pos;
uint field_count;
ulong length, param_count;
MYSQL_DATA *fields_data;
DBUG_ENTER("read_prepare_result");
DBUG_ENTER("cli_read_prepare_result");
mysql= mysql->last_used_con;
if ((length= net_safe_read(mysql)) == packet_error)
@ -1586,18 +1586,8 @@ static my_bool read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
mysql->server_capabilities)))
DBUG_RETURN(1);
}
if (!(stmt->params= (MYSQL_BIND *) alloc_root(&stmt->mem_root,
sizeof(MYSQL_BIND)*
(param_count +
field_count))))
{
set_stmt_error(stmt, CR_OUT_OF_MEMORY, unknown_sqlstate);
DBUG_RETURN(0);
}
stmt->bind= (stmt->params + param_count);
stmt->field_count= (uint) field_count;
stmt->param_count= (ulong) param_count;
mysql->status= MYSQL_STATUS_READY;
DBUG_RETURN(0);
}
@ -1641,14 +1631,22 @@ mysql_prepare(MYSQL *mysql, const char *query, ulong length)
}
init_alloc_root(&stmt->mem_root,8192,0);
if (read_prepare_result(mysql, stmt))
if ((*mysql->read_prepare_result)(mysql, stmt))
{
stmt_close(stmt, 1);
DBUG_RETURN(0);
}
if (!(stmt->params= (MYSQL_BIND *) alloc_root(&stmt->mem_root,
sizeof(MYSQL_BIND)*
(param_count +
field_count))))
set_stmt_error(stmt, CR_OUT_OF_MEMORY, unknown_sqlstate);
stmt->bind= stmt->params + param_count;
stmt->state= MY_ST_PREPARE;
stmt->mysql= mysql;
mysql->stmts= list_add(mysql->stmts, &stmt->list);
mysql->status= MYSQL_STATUS_READY;
stmt->list.data= stmt;
DBUG_PRINT("info", ("Parameter count: %ld", stmt->param_count));
DBUG_RETURN(stmt);