diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-13 22:32:18 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-07-13 22:32:18 +0500 |
| commit | d9992cc79eb8c51c2b967ec60137638583a8143d (patch) | |
| tree | d0abbb795b7f5dca489bba6673a69c87d67e9832 /sql-common | |
| parent | 1787072458f518c68b940f17f54f2b5658f45469 (diff) | |
| parent | eadcf20081b18b28f344552a9902fea2404d55bd (diff) | |
| download | mariadb-git-d9992cc79eb8c51c2b967ec60137638583a8143d.tar.gz | |
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.16017
include/sql_common.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysqld/libmysqld.c:
merging
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 3 |
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; |