diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 20:38:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 20:38:59 +0200 |
| commit | e1f681c99b3e5462c033aaafa94ac295e626cde2 (patch) | |
| tree | 2da5eff1a0d03831c2d85b32a7bc3df6ec37b522 /include/sql_common.h | |
| parent | 52c84d144d3b07966d9b3bab8694eb012eef69ce (diff) | |
| parent | 807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff) | |
| download | mariadb-git-e1f681c99b3e5462c033aaafa94ac295e626cde2.tar.gz | |
10.0-base -> 10.0-monty
Diffstat (limited to 'include/sql_common.h')
| -rw-r--r-- | include/sql_common.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index 99abdb2bf72..406a87010fb 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. - Copyright (c) 2010, 2011, Monty Program Ab +/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. + Copyright (c) 2010, 2012, Monty Program Ab 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 @@ -82,8 +82,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); |