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/mysql_priv.h | |
| 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/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index bd0e1455eb2..e725cd177c3 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -446,6 +446,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; |