diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-06-29 16:54:55 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-06-29 16:54:55 +0300 |
| commit | e65c291807f57b9533df07963b0385cbfdd5b474 (patch) | |
| tree | e47e30d41c92efb2ee66c520957eae4bdf7b8513 /include | |
| parent | 66ef5b0d48006263e2ae8eec29fd8900d6708af4 (diff) | |
| parent | 107c894a540d147338ab4e737eb9ef76e49c3493 (diff) | |
| download | mariadb-git-e65c291807f57b9533df07963b0385cbfdd5b474.tar.gz | |
merge bug#13708485 5.1->5.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/sql_common.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index c27767bd0eb..307b443d6d6 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -1,7 +1,7 @@ #ifndef SQL_COMMON_INCLUDED #define SQL_COMMON_INCLUDED -/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -72,8 +72,9 @@ typedef struct st_mysql_methods 0, arg, length, 1, stmt) extern CHARSET_INFO *default_client_charset_info; -MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, - my_bool default_value, uint server_capabilities); +MYSQL_FIELD *unpack_fields(MYSQL *mysql, MYSQL_DATA *data,MEM_ROOT *alloc, + uint fields, my_bool default_value, + uint server_capabilities); void free_rows(MYSQL_DATA *cur); void free_old_query(MYSQL *mysql); void end_server(MYSQL *mysql); |