diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 15:57:23 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 15:57:23 +0300 |
| commit | 05459706f22b1d9d22abd24e6de3b505d787beb3 (patch) | |
| tree | 3e850e0cbf5489fbf36f5c1579248e344bfe2395 /sql/net_serv.cc | |
| parent | 8ae2a2dbe6fc52d40ec88c325b9a44de52f83f2f (diff) | |
| parent | e6a808bec790fdbbf1dc0a6b03fb6c8b6e41dc01 (diff) | |
| download | mariadb-git-05459706f22b1d9d22abd24e6de3b505d787beb3.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 576ef5009b5..c289fb2bc85 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -110,7 +110,7 @@ void sql_print_error(const char *format,...); extern, but as it's hard to include sql_priv.h here, we have to live with this for a while. */ -extern uint test_flags; +extern ulonglong test_flags; extern ulong bytes_sent, bytes_received, net_big_packet_count; #ifdef HAVE_QUERY_CACHE #define USE_QUERY_CACHE |