diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-05 11:36:53 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-05 11:36:53 +0200 |
| commit | a903be5d964fcda2c7f6eb649885dbd98901fb72 (patch) | |
| tree | c4714d265a82b3c7aef7188853b439d8d54b8bf5 /sql/innodb_priv.h | |
| parent | 1f63feb91a027cdccbf3c14d513d11acf8aa7431 (diff) | |
| parent | 6935d66053b2c9723314d89d5169dcf34ed56c08 (diff) | |
| download | mariadb-git-10.2-wlad-merge.tar.gz | |
Merge commit '6935d66053b2c9723314d89d5169dcf34ed56c08' into bb-10.2-marko10.2-wlad-merge
# Conflicts:
# debian/control
# debian/mariadb-server-10.2.install
# include/my_sys.h
# mysql-test/collections/buildbot_suites.bat
# plugin/auth_dialog/CMakeLists.txt
# sql/CMakeLists.txt
# sql/sql_class.cc
# storage/innobase/CMakeLists.txt
# storage/innobase/log/log0crypt.cc
# win/packaging/CPackWixConfig.cmake
Diffstat (limited to 'sql/innodb_priv.h')
| -rw-r--r-- | sql/innodb_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/innodb_priv.h b/sql/innodb_priv.h index ec85aa352f8..27aa9ac8645 100644 --- a/sql/innodb_priv.h +++ b/sql/innodb_priv.h @@ -28,6 +28,7 @@ void localtime_to_TIME(MYSQL_TIME *to, struct tm *from); uint strconvert(CHARSET_INFO *from_cs, const char *from, uint from_length, CHARSET_INFO *to_cs, char *to, uint to_length, uint *errors); + void sql_print_error(const char *format, ...); #define thd_binlog_pos(X, Y, Z) mysql_bin_log_commit_pos(X, Z, Y) |