diff options
| author | unknown <monty@mysql.com> | 2004-10-27 19:52:41 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-27 19:52:41 +0300 |
| commit | e646f8f2d19fbfd24c8cc4ce62322691e88d12d1 (patch) | |
| tree | d9b411a738093cebf4896002805fdc91ca117fb1 /sql/sql_cache.h | |
| parent | 55833fb49bf8570ee11d4b85b143a9a3975733fa (diff) | |
| parent | 3bdd7e77fdb66acb4d051dec2b1c4fd136a49f9c (diff) | |
| download | mariadb-git-e646f8f2d19fbfd24c8cc4ce62322691e88d12d1.tar.gz | |
Merge with 4.0
BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
Auto merged
innobase/include/trx0sys.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0rseg.c:
Auto merged
mysql-test/r/innodb-lock.result:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
Use local version during merge
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h index fc458f39e29..c933a2349af 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -143,14 +143,14 @@ struct Query_cache_query struct Query_cache_table { char *tbl; - uint key_len; + uint32 key_len; uint8 table_type; inline char *db() { return (char *) data(); } inline char *table() { return tbl; } inline void table(char *table) { tbl= table; } - inline uint key_length() { return key_len; } - inline void key_length(uint len) { key_len= len; } + inline uint32 key_length() { return key_len; } + inline void key_length(uint32 len) { key_len= len; } inline uint8 type() { return table_type; } inline void type(uint8 t) { table_type= t; } inline gptr data() |