mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Trim trailing spaces.
This commit is contained in:
@@ -759,7 +759,7 @@ static bool emb_insert_params_withlog(Prepared_statement *stmt, String *query)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
uchar *buff= (uchar*)client_param->buffer;
|
uchar *buff= (uchar*)client_param->buffer;
|
||||||
param->unsigned_flag= client_param->is_unsigned;
|
param->unsigned_flag= client_param->is_unsigned;
|
||||||
param->set_param_func(param, &buff,
|
param->set_param_func(param, &buff,
|
||||||
client_param->length ?
|
client_param->length ?
|
||||||
*client_param->length :
|
*client_param->length :
|
||||||
@@ -885,8 +885,8 @@ static bool insert_params_from_vars_with_log(Prepared_statement *stmt,
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_insert()
|
mysql_test_insert()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables global/local table list
|
tables global/local table list
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
FALSE success
|
FALSE success
|
||||||
@@ -958,7 +958,7 @@ static bool mysql_test_insert(Prepared_statement *stmt,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
if (setup_fields(thd, 0, table_list, *values, 0, 0, 0))
|
if (setup_fields(thd, 0, table_list, *values, 0, 0, 0))
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
DBUG_RETURN(FALSE);
|
DBUG_RETURN(FALSE);
|
||||||
@@ -974,8 +974,8 @@ error:
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_update()
|
mysql_test_update()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables queries
|
tables list of tables queries
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
0 success
|
0 success
|
||||||
@@ -991,7 +991,7 @@ static int mysql_test_update(Prepared_statement *stmt,
|
|||||||
uint table_count= 0;
|
uint table_count= 0;
|
||||||
SELECT_LEX *select= &stmt->lex->select_lex;
|
SELECT_LEX *select= &stmt->lex->select_lex;
|
||||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||||
uint want_privilege;
|
uint want_privilege;
|
||||||
#endif
|
#endif
|
||||||
DBUG_ENTER("mysql_test_update");
|
DBUG_ENTER("mysql_test_update");
|
||||||
|
|
||||||
@@ -1058,8 +1058,8 @@ error:
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_delete()
|
mysql_test_delete()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables queries
|
tables list of tables queries
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
FALSE success
|
FALSE success
|
||||||
@@ -1097,8 +1097,8 @@ error:
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_select()
|
mysql_test_select()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables queries
|
tables list of tables queries
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
FALSE success
|
FALSE success
|
||||||
@@ -1180,9 +1180,9 @@ error:
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_do_fields()
|
mysql_test_do_fields()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables queries
|
tables list of tables queries
|
||||||
values list of expressions
|
values list of expressions
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
FALSE success
|
FALSE success
|
||||||
@@ -1190,8 +1190,8 @@ error:
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static bool mysql_test_do_fields(Prepared_statement *stmt,
|
static bool mysql_test_do_fields(Prepared_statement *stmt,
|
||||||
TABLE_LIST *tables,
|
TABLE_LIST *tables,
|
||||||
List<Item> *values)
|
List<Item> *values)
|
||||||
{
|
{
|
||||||
THD *thd= stmt->thd;
|
THD *thd= stmt->thd;
|
||||||
|
|
||||||
@@ -1210,9 +1210,9 @@ static bool mysql_test_do_fields(Prepared_statement *stmt,
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_set_fields()
|
mysql_test_set_fields()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables queries
|
tables list of tables queries
|
||||||
values list of expressions
|
values list of expressions
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
FALSE success
|
FALSE success
|
||||||
@@ -1323,8 +1323,8 @@ select_like_stmt_test_with_open_n_lock(Prepared_statement *stmt,
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_create_table()
|
mysql_test_create_table()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables queries
|
tables list of tables queries
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
FALSE success
|
FALSE success
|
||||||
@@ -1364,8 +1364,8 @@ static bool mysql_test_create_table(Prepared_statement *stmt)
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_multiupdate()
|
mysql_test_multiupdate()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables queries
|
tables list of tables queries
|
||||||
converted converted to multi-update from usual update
|
converted converted to multi-update from usual update
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
@@ -1374,7 +1374,7 @@ static bool mysql_test_create_table(Prepared_statement *stmt)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static bool mysql_test_multiupdate(Prepared_statement *stmt,
|
static bool mysql_test_multiupdate(Prepared_statement *stmt,
|
||||||
TABLE_LIST *tables,
|
TABLE_LIST *tables,
|
||||||
bool converted)
|
bool converted)
|
||||||
{
|
{
|
||||||
/* if we switched from normal update, rights are checked */
|
/* if we switched from normal update, rights are checked */
|
||||||
@@ -1391,8 +1391,8 @@ static bool mysql_test_multiupdate(Prepared_statement *stmt,
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_multidelete()
|
mysql_test_multidelete()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables queries
|
tables list of tables queries
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
0 success
|
0 success
|
||||||
@@ -1400,7 +1400,7 @@ static bool mysql_test_multiupdate(Prepared_statement *stmt,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static bool mysql_test_multidelete(Prepared_statement *stmt,
|
static bool mysql_test_multidelete(Prepared_statement *stmt,
|
||||||
TABLE_LIST *tables)
|
TABLE_LIST *tables)
|
||||||
{
|
{
|
||||||
uint fake_counter;
|
uint fake_counter;
|
||||||
|
|
||||||
@@ -1419,7 +1419,7 @@ static bool mysql_test_multidelete(Prepared_statement *stmt,
|
|||||||
if (!tables->table)
|
if (!tables->table)
|
||||||
{
|
{
|
||||||
my_error(ER_VIEW_DELETE_MERGE_VIEW, MYF(0),
|
my_error(ER_VIEW_DELETE_MERGE_VIEW, MYF(0),
|
||||||
tables->view_db.str, tables->view_name.str);
|
tables->view_db.str, tables->view_name.str);
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -1460,8 +1460,8 @@ static bool mysql_insert_select_prepare_tester(THD *thd)
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_test_insert_select()
|
mysql_test_insert_select()
|
||||||
stmt prepared statemen handler
|
stmt prepared statemen handler
|
||||||
tables list of tables of query
|
tables list of tables of query
|
||||||
|
|
||||||
RETURN VALUE
|
RETURN VALUE
|
||||||
0 success
|
0 success
|
||||||
@@ -1470,7 +1470,7 @@ static bool mysql_insert_select_prepare_tester(THD *thd)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static int mysql_test_insert_select(Prepared_statement *stmt,
|
static int mysql_test_insert_select(Prepared_statement *stmt,
|
||||||
TABLE_LIST *tables)
|
TABLE_LIST *tables)
|
||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
LEX *lex= stmt->lex;
|
LEX *lex= stmt->lex;
|
||||||
@@ -1538,9 +1538,9 @@ static bool check_prepared_statement(Prepared_statement *stmt,
|
|||||||
case SQLCOM_REPLACE:
|
case SQLCOM_REPLACE:
|
||||||
case SQLCOM_INSERT:
|
case SQLCOM_INSERT:
|
||||||
res= mysql_test_insert(stmt, tables, lex->field_list,
|
res= mysql_test_insert(stmt, tables, lex->field_list,
|
||||||
lex->many_values,
|
lex->many_values,
|
||||||
select_lex->item_list, lex->value_list,
|
select_lex->item_list, lex->value_list,
|
||||||
lex->duplicates);
|
lex->duplicates);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SQLCOM_UPDATE:
|
case SQLCOM_UPDATE:
|
||||||
@@ -1867,8 +1867,8 @@ void reset_stmt_for_execute(THD *thd, LEX *lex)
|
|||||||
they have their own table list).
|
they have their own table list).
|
||||||
*/
|
*/
|
||||||
for (TABLE_LIST *tables= lex->query_tables;
|
for (TABLE_LIST *tables= lex->query_tables;
|
||||||
tables;
|
tables;
|
||||||
tables= tables->next_global)
|
tables= tables->next_global)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
Reset old pointers to TABLEs: they are not valid since the tables
|
Reset old pointers to TABLEs: they are not valid since the tables
|
||||||
@@ -1902,7 +1902,7 @@ void reset_stmt_for_execute(THD *thd, LEX *lex)
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
reset_stmt_params()
|
reset_stmt_params()
|
||||||
stmt prepared statement for which parameters should be reset
|
stmt prepared statement for which parameters should be reset
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void reset_stmt_params(Prepared_statement *stmt)
|
static void reset_stmt_params(Prepared_statement *stmt)
|
||||||
@@ -2163,9 +2163,9 @@ static void execute_stmt(THD *thd, Prepared_statement *stmt,
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_stmt_fetch()
|
mysql_stmt_fetch()
|
||||||
thd Thread handler
|
thd Thread handler
|
||||||
packet Packet from client (with stmt_id & num_rows)
|
packet Packet from client (with stmt_id & num_rows)
|
||||||
packet_length Length of packet
|
packet_length Length of packet
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void mysql_stmt_fetch(THD *thd, char *packet, uint packet_length)
|
void mysql_stmt_fetch(THD *thd, char *packet, uint packet_length)
|
||||||
@@ -2192,7 +2192,7 @@ void mysql_stmt_fetch(THD *thd, char *packet, uint packet_length)
|
|||||||
if (!(specialflag & SPECIAL_NO_PRIOR))
|
if (!(specialflag & SPECIAL_NO_PRIOR))
|
||||||
my_pthread_setprio(pthread_self(), QUERY_PRIOR);
|
my_pthread_setprio(pthread_self(), QUERY_PRIOR);
|
||||||
|
|
||||||
thd->protocol= &thd->protocol_prep; // Switch to binary protocol
|
thd->protocol= &thd->protocol_prep; // Switch to binary protocol
|
||||||
stmt->cursor->fetch(num_rows);
|
stmt->cursor->fetch(num_rows);
|
||||||
thd->protocol= &thd->protocol_simple; // Use normal protocol
|
thd->protocol= &thd->protocol_simple; // Use normal protocol
|
||||||
|
|
||||||
@@ -2213,7 +2213,7 @@ void mysql_stmt_fetch(THD *thd, char *packet, uint packet_length)
|
|||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_stmt_reset()
|
mysql_stmt_reset()
|
||||||
thd Thread handle
|
thd Thread handle
|
||||||
packet Packet with stmt id
|
packet Packet with stmt id
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
This function resets statement to the state it was right after prepare.
|
This function resets statement to the state it was right after prepare.
|
||||||
@@ -2280,9 +2280,9 @@ void mysql_stmt_free(THD *thd, char *packet)
|
|||||||
|
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
mysql_stmt_get_longdata()
|
mysql_stmt_get_longdata()
|
||||||
thd Thread handle
|
thd Thread handle
|
||||||
pos String to append
|
pos String to append
|
||||||
packet_length Length of string
|
packet_length Length of string
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
Get a part of a long data.
|
Get a part of a long data.
|
||||||
|
Reference in New Issue
Block a user