diff options
| author | unknown <jimw@mysql.com> | 2005-01-31 15:30:34 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-31 15:30:34 -0800 |
| commit | ccf0b1ee2c45b6d3ade234a2d0de0f0d9c1ce7fc (patch) | |
| tree | 4a1cfe621cca97302ec5405ef17d343533bbbf92 /sql/sql_cache.cc | |
| parent | 35e490faf7cb70e35640ea6983a6aac8983ccadf (diff) | |
| parent | 4f7bcc32dfbef98185292f6271e39bbaff1f5690 (diff) | |
| download | mariadb-git-ccf0b1ee2c45b6d3ade234a2d0de0f0d9c1ce7fc.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-6511
into mysql.com:/home/jimw/my/mysql-4.1-clean
sql/mysql_priv.h:
Auto merged
sql/sql_cache.cc:
Auto merged
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 55e96ec0c6d..e1367412601 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -776,6 +776,8 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used) bzero(&flags, QUERY_CACHE_FLAGS_SIZE); flags.client_long_flag= (thd->client_capabilities & CLIENT_LONG_FLAG ? 1 : 0); + flags.client_protocol_41= (thd->client_capabilities & CLIENT_PROTOCOL_41 ? + 1 : 0); flags.character_set_client_num= thd->variables.character_set_client->number; flags.character_set_results_num= @@ -968,6 +970,8 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) bzero(&flags, QUERY_CACHE_FLAGS_SIZE); flags.client_long_flag= (thd->client_capabilities & CLIENT_LONG_FLAG ? 1 : 0); + flags.client_protocol_41= (thd->client_capabilities & CLIENT_PROTOCOL_41 ? + 1 : 0); flags.character_set_client_num= thd->variables.character_set_client->number; flags.character_set_results_num= (thd->variables.character_set_results ? |