diff options
| author | unknown <jimw@mysql.com> | 2005-01-31 16:27:17 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-31 16:27:17 -0800 |
| commit | 8b08a2e87fdf558412b180a972eccffe44d25944 (patch) | |
| tree | 02cde2dbc0704828132dd2152934f06bf79e931f /sql/sql_cache.cc | |
| parent | dd385f2493f836fa899c8906ac76db5cf160170c (diff) | |
| parent | af5e2a1034909c249a062398a0798982b75a0d47 (diff) | |
| download | mariadb-git-8b08a2e87fdf558412b180a972eccffe44d25944.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
client/mysqldump.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
strings/ctype-simple.c:
SCCS 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 c08d3eae0e1..d63877dc755 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -777,6 +777,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= @@ -974,6 +976,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 ? |