diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-06-02 09:50:47 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-06-02 09:50:47 +0200 |
| commit | c01a9fc22bbe40dbe36fe31c2d960d81119392d3 (patch) | |
| tree | 7007e35d5106c2d789cf579e9891c82deca15283 /sql/log_event.cc | |
| parent | 815d705f0e7d8ef5d90d592da15c82cf0b4881df (diff) | |
| parent | bda8d58d8eb58017c8745a9fac418d87e7e889c5 (diff) | |
| download | mariadb-git-c01a9fc22bbe40dbe36fe31c2d960d81119392d3.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
sql/field.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 12104b27dd3..9410a42373a 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -16,6 +16,9 @@ #ifndef MYSQL_CLIENT + +#include <my_global.h> + #ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif |