diff options
| author | monty@mysql.com <> | 2004-02-17 01:35:17 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-17 01:35:17 +0200 |
| commit | e9315f984d9224044e771b5c483050a81b03b947 (patch) | |
| tree | 7e3324032ecc97c6af3771a6904e8ae32dbf7a48 /include | |
| parent | 050af89dd8034046df593c1ac7e060ee37bfdf27 (diff) | |
| download | mariadb-git-e9315f984d9224044e771b5c483050a81b03b947.tar.gz | |
Changed wellformedlen to well_formed_len
Fixed that blobs >16M can be inserted/updated
Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 6 | ||||
| -rw-r--r-- | include/mysql.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 5870458af56..a97d25862bd 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -144,7 +144,7 @@ typedef struct my_charset_handler_st int (*mbcharlen)(struct charset_info_st *, uint); uint (*numchars)(struct charset_info_st *, const char *b, const char *e); uint (*charpos)(struct charset_info_st *, const char *b, const char *e, uint pos); - uint (*wellformedlen)(struct charset_info_st *, + uint (*well_formed_len)(struct charset_info_st *, const char *b,const char *e, uint nchars); uint (*lengthsp)(struct charset_info_st *, const char *ptr, uint length); @@ -313,7 +313,7 @@ int my_wildcmp_8bit(CHARSET_INFO *, uint my_numchars_8bit(CHARSET_INFO *, const char *b, const char *e); uint my_charpos_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos); -uint my_wellformedlen_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos); +uint my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos); int my_mbcharlen_8bit(CHARSET_INFO *, uint c); @@ -330,7 +330,7 @@ int my_wildcmp_mb(CHARSET_INFO *, int escape, int w_one, int w_many); uint my_numchars_mb(CHARSET_INFO *, const char *b, const char *e); uint my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, uint pos); -uint my_wellformedlen_mb(CHARSET_INFO *, const char *b, const char *e, uint pos); +uint my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e, uint pos); uint my_instr_mb(struct charset_info_st *, const char *b, uint b_length, const char *s, uint s_length, diff --git a/include/mysql.h b/include/mysql.h index 35d9aa62040..5b3037d9261 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -534,8 +534,8 @@ typedef struct st_mysql_stmt char *query; /* query buffer */ MEM_ROOT mem_root; /* root allocations */ my_ulonglong last_fetched_column; /* last fetched column */ - my_ulonglong affected_rows; /* copy of mysql->affected_rows - after statement execution */ + /* copy of mysql->affected_rows after statement execution */ + my_ulonglong affected_rows; unsigned long stmt_id; /* Id for prepared statement */ unsigned int last_errno; /* error code */ unsigned int param_count; /* parameters count */ |