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 | af5e2a1034909c249a062398a0798982b75a0d47 (patch) | |
| tree | 4a1cfe621cca97302ec5405ef17d343533bbbf92 /sql | |
| parent | ec12a1f34175e52ba49cae349133d6d964e93ccc (diff) | |
| parent | 395137e1b209ef5542a482274691959101d0a72a (diff) | |
| download | mariadb-git-af5e2a1034909c249a062398a0798982b75a0d47.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')
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/sql_cache.cc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 06a17acd2a1..6218bc49f53 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -377,6 +377,7 @@ Item *negate_expression(THD *thd, Item *expr); struct Query_cache_query_flags { unsigned int client_long_flag:1; + unsigned int client_protocol_41:1; uint character_set_client_num; uint character_set_results_num; uint collation_connection_num; 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 ? |