summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorholyfoot/hf@mysql.com/deer.(none) <>2006-07-18 14:52:29 +0500
committerholyfoot/hf@mysql.com/deer.(none) <>2006-07-18 14:52:29 +0500
commitbed7b69243cf04bfde409222285b563596c6f359 (patch)
tree942c3cb8d61303a6fe7a697ad2c646f07cb442b8 /sql-common
parent14519de0fc98fa749565470cfc80cd6a131582ad (diff)
parenteddaafb12ba48d110f03a901884ab4101624c1a3 (diff)
downloadmariadb-git-bed7b69243cf04bfde409222285b563596c6f359.tar.gz
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into mysql.com:/home/hf/work/mysql-5.0.mrg
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 66d409cf1eb..45cd8befdf0 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -647,7 +647,8 @@ void free_rows(MYSQL_DATA *cur)
my_bool
cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
const char *header, ulong header_length,
- const char *arg, ulong arg_length, my_bool skip_check)
+ const char *arg, ulong arg_length, my_bool skip_check,
+ MYSQL_STMT *stmt __attribute__((unused)))
{
NET *net= &mysql->net;
my_bool result= 1;