diff options
| author | unknown <monty@mysql.com> | 2004-04-30 14:02:17 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-30 14:02:17 +0300 |
| commit | 15c2bb61f505a1ce59894c3c299e533667274860 (patch) | |
| tree | e1353cabd03b354f8b81634423e6b0e5cb0e54f5 /include/mysql.h | |
| parent | ae629fff866dda4e0e3411b0614d0c1efdfb6362 (diff) | |
| download | mariadb-git-15c2bb61f505a1ce59894c3c299e533667274860.tar.gz | |
Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
Added checking of cut read lines in bootstrap thread (Bug #2874)
include/mysql.h:
Added length to MYSQL_ROWS to enable sanity checking of packets
Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result()
libmysql/libmysql.c:
Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
scripts/fill_help_tables.sh:
Added checking of maximum length of line in output (Bug #2874)
scripts/mysql_install_db.sh:
Added error message if help tables couldn't be done (Bug #2874)
sql/sql_parse.cc:
Added checking of cut read lines in bootstrap thread (Bug #2874)
tests/client_test.c:
Added --debug
Changed some strange define names
Less output
Added testing of max_length for prepared statements
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h index 852d633facf..5e8df264b3a 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -87,8 +87,8 @@ typedef struct st_mysql_field { char *db; /* Database for table */ char *catalog; /* Catalog for table */ char *def; /* Default value (set by mysql_list_fields) */ - unsigned long length; /* Width of column */ - unsigned long max_length; /* Max width of selected set */ + unsigned long length; /* Width of column (create length) */ + unsigned long max_length; /* Max width for selected set */ unsigned int name_length; unsigned int org_name_length; unsigned int table_length; @@ -120,6 +120,7 @@ typedef unsigned long long my_ulonglong; typedef struct st_mysql_rows { struct st_mysql_rows *next; /* list of rows */ MYSQL_ROW data; + ulong length; } MYSQL_ROWS; typedef MYSQL_ROWS *MYSQL_ROW_OFFSET; /* offset to current row */ @@ -547,12 +548,15 @@ typedef struct st_mysql_bind unsigned long offset; /* offset position for char/binary fetch */ unsigned long internal_length; /* Used if length is 0 */ unsigned int param_number; /* For null count and error messages */ + unsigned int pack_length; /* Internal length for packed data */ my_bool long_data_used; /* If used with mysql_send_long_data */ my_bool binary_data; /* data buffer is binary */ my_bool null_field; /* NULL data cache flag */ my_bool internal_is_null; /* Used if is_null is 0 */ void (*store_param_func)(NET *net, struct st_mysql_bind *param); void (*fetch_result)(struct st_mysql_bind *, unsigned char **row); + void (*skip_result)(struct st_mysql_bind *, MYSQL_FIELD *, + unsigned char **row); } MYSQL_BIND; |