database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge of mysql-5.1-bugteam to

Browse Source 
mysql-trunk-merge.

Conflicts:

Text conflict in sql/sql_priv.h
This commit is contained in:
Alexey Kopytov
2010-04-19 16:09:44 +04:00
parent 54f3f65601 2283e1b510
commit ee09f97211
326 changed files with 5719 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqlbinlog.cc
View File

@ -31,7 +31,7 @@
#include "client_priv.h"
#include <my_time.h>
/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
#include "mysql_priv.h"
#include "sql_priv.h"
#include "log_event.h"
#include "sql_common.h"