diff options
author | unknown <monty@hundin.mysql.fi> | 2001-08-21 20:06:00 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-08-21 20:06:00 +0300 |
commit | d61418b94fc2f377c11775039bfe5a7106541b3a (patch) | |
tree | cc0b5646a48d97a66571d12ba2d4c29f6c1059e5 /sql/field.h | |
parent | a14d63ba6e6b9ee411ac576e513fa31f652138e6 (diff) | |
download | mariadb-git-d61418b94fc2f377c11775039bfe5a7106541b3a.tar.gz |
Portability fixes.
Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX
Docs/manual.texi:
Some updates from mailing list.
Changelog
client/mysqlbinlog.cc:
Removed variables declared in net.c
configure.in:
Added test for strtoll and fixed test for gethostname_r for AIX
mysql-test/t/innodb.test:
Added test of active transactions
sql/field.cc:
Patch required by Gemini
sql/field.h:
Patch required by Gemini
sql/filesort.cc:
Patch required by Gemini
sql/gen_lex_hash.cc:
Update to support new syntax
sql/ha_gemini.cc:
Patch required by Gemini
sql/ha_gemini.h:
Patch required by Gemini
sql/ha_innobase.cc:
Fix to properly detect if there is an active transaction in InnoDB
sql/handler.cc:
Fix to properly detect if there is an active transaction in InnoDB
sql/handler.h:
Fix to properly detect if there is an active transaction in InnoDB.
Fix for Gemini
sql/lex.h:
SHOW LOCKS
sql/mysqld.cc:
Fix to not lock thread structure when doing automatic rollback when thread ends.
sql/share/portuguese/errmsg.txt:
Update
sql/sql_class.cc:
Fix to not lock thread structure when doing automatic rollback when thread ends.
sql/sql_class.h:
Fix to properly detect if there is an active transaction in InnoDB
sql/sql_delete.cc:
Fix for Gemini
sql/sql_parse.cc:
Allow -O lower_case_names=0 on UNIX
sql/sql_select.cc:
Fix for Gemini
sql/sql_table.cc:
Allow -O lower_case_names=0 on UNIX
sql/sql_update.cc:
Fix for Gemini
sql/sql_yacc.yy:
For SHOW LOCKS
strings/strto.c:
Portability fix
Diffstat (limited to 'sql/field.h')
-rw-r--r-- | sql/field.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index b5d7c613701..ee18d2fa7ae 100644 --- a/sql/field.h +++ b/sql/field.h @@ -874,6 +874,14 @@ public: uint max_length= ~(uint) 0); ulonglong get_id(const char *from); const char *unpack_id(char *to, const char *from, const char *bdata); + inline void get_ptr_from_key_image(char **str,char *key_str) + { + *str = key_str + sizeof(uint16); + } + inline uint get_length_from_key_image(char *key_str) + { + return uint2korr(key_str); + } enum_field_types blobtype() { return (packlength == 1 ? FIELD_TYPE_TINY_BLOB : FIELD_TYPE_BLOB);} #endif char *pack_key(char *to, const char *from, uint max_length); |