summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorholyfoot/hf@mysql.com/deer.(none) <>2006-07-13 22:32:18 +0500
committerholyfoot/hf@mysql.com/deer.(none) <>2006-07-13 22:32:18 +0500
commiteddaafb12ba48d110f03a901884ab4101624c1a3 (patch)
treed0abbb795b7f5dca489bba6673a69c87d67e9832 /sql-common
parent0f070b0b32924dd440971fce3664c39b31c63c0d (diff)
parentbc35c50063a28afeb6c70c22607a76088a1f10cb (diff)
downloadmariadb-git-eddaafb12ba48d110f03a901884ab4101624c1a3.tar.gz
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.16017
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 ea8baeeffc7..e5bab51ca8a 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -650,7 +650,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;