diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 11:40:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 11:40:39 +0200 |
| commit | cefc30b1663114930439e03dec245604bc904604 (patch) | |
| tree | 83a4479fe38adb24e478dde743856f04d65fa801 /include | |
| parent | 34f2f8ea41726d98e50752ff3453ebde70912c35 (diff) | |
| parent | 171355077501da7ddd32778ab3ebe77c5f7ce7da (diff) | |
| download | mariadb-git-cefc30b1663114930439e03dec245604bc904604.tar.gz | |
merge with MySQL 5.1.65
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_getopt.h | 4 | ||||
| -rw-r--r-- | include/sql_common.h | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h index aeed8fa1586..a8d14c9aba5 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2002, 2011, Oracle and/or its affiliates. + Copyright (c) 2002, 2012, Oracle and/or its affiliates. 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 @@ -54,7 +54,7 @@ struct my_option enum get_opt_arg_type arg_type; longlong def_value; /* Default value */ longlong min_value; /* Min allowed value */ - longlong max_value; /* Max allowed value */ + ulonglong max_value; /* Max allowed value */ longlong sub_size; /* Subtract this from given value */ long block_size; /* Value should be a mult. of this */ void *app_type; /* To be used by an application */ diff --git a/include/sql_common.h b/include/sql_common.h index 9e43d076ba9..b64277ce7e1 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2003-2004, 2006 MySQL AB +/* + 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 @@ -23,8 +24,9 @@ extern "C" { #endif 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); |