diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
| commit | a6481aa4c7016c996a9787db4824307c705ec8a1 (patch) | |
| tree | b60f635d3126e8d0f1321f0187390d7cf8496558 /sql/sql_cache.h | |
| parent | 95564bfea31aef4686ae4e7c6d422e2a20a5d73a (diff) | |
| parent | 88dd873de0d5dc6e8f262268f925596a60b58704 (diff) | |
| download | mariadb-git-a6481aa4c7016c996a9787db4824307c705ec8a1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
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 a66067159e2..618dea2c89b 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -128,7 +128,7 @@ struct Query_cache_query inline void tables_type(uint8 type) { tbls_type= type; } inline ulong length() { return len; } inline ulong add(ulong packet_len) { return(len+= packet_len); } - inline void length(ulong length) { len= length; } + inline void length(ulong length_arg) { len= length_arg; } inline gptr query() { return (gptr)(((byte*)this)+ @@ -156,7 +156,7 @@ struct Query_cache_table inline char *db() { return (char *) data(); } inline char *table() { return tbl; } - inline void table(char *table) { tbl= table; } + inline void table(char *table_arg) { tbl= table_arg; } inline uint32 key_length() { return key_len; } inline void key_length(uint32 len) { key_len= len; } inline uint8 type() { return table_type; } @@ -164,7 +164,7 @@ struct Query_cache_table inline qc_engine_callback callback() { return callback_func; } inline void callback(qc_engine_callback fn){ callback_func= fn; } inline ulonglong engine_data() { return engine_data_buff; } - inline void engine_data(ulonglong data) { engine_data_buff= data; } + inline void engine_data(ulonglong data_arg){ engine_data_buff= data_arg; } inline gptr data() { return (gptr)(((byte*)this)+ |