diff options
| author | monty@mysql.com <> | 2005-06-03 23:46:03 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-06-03 23:46:03 +0300 |
| commit | 29fd1f2fd93a9cad806814556be3eb0c53cd6c7c (patch) | |
| tree | 1f3455d4bb48f50d0cf7630ce12209eefac021a2 /sql/protocol.cc | |
| parent | fd17d75923dd06471e1659d02832f2dbe22c8c70 (diff) | |
| download | mariadb-git-29fd1f2fd93a9cad806814556be3eb0c53cd6c7c.tar.gz | |
Move USE_PRAGMA_IMPLEMENTATION to proper place
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 835bd986fb8..9a1a05591dd 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -19,13 +19,10 @@ The actual communction is handled by the net_xxx functions in net_serv.cc */ -#include <my_global.h> - +#include "mysql_priv.h" #ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif - -#include "mysql_priv.h" #include <stdarg.h> static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024; |