diff options
| author | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2006-06-27 18:24:14 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2006-06-27 18:24:14 +0500 |
| commit | bddaa6f2f0ae2d96f8729ae1bd7f1a38e4c24a6c (patch) | |
| tree | 0089a34df1fe527e504be7fd20c768a9b2a3134a /sql/sql_db.cc | |
| parent | 7ad755e7c71165f5914f85225d4fa7816dd0fddf (diff) | |
| parent | 57f3f2568ee27b30f0062b0175faf9f0a1a854e1 (diff) | |
| download | mariadb-git-bddaa6f2f0ae2d96f8729ae1bd7f1a38e4c24a6c.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index f598f58b8ee..bcd1b99b91a 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -20,7 +20,7 @@ #include "mysql_priv.h" #include <mysys_err.h> #include "sp.h" -#include "event.h" +#include "events.h" #include <my_dir.h> #include <m_ctype.h> #ifdef __WIN__ |