diff options
| author | Monty <monty@mariadb.org> | 2018-01-05 16:52:40 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-05 16:52:40 +0200 |
| commit | e9a2082634ee7e5f2c61f7cbae467ad16925b63c (patch) | |
| tree | 6a3a6cfb0e64a21b7d60348ab5e69099fb532223 /sql/sql_digest.cc | |
| parent | 1a1bda2222e0c2ab41baed1510f6fbca80c20d31 (diff) | |
| parent | 287d105398db726cc15c02dff26ce039cf03ded3 (diff) | |
| download | mariadb-git-e9a2082634ee7e5f2c61f7cbae467ad16925b63c.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/cte_nonrecursive.result
mysql-test/suite/galera/r/galera_bf_abort.result
mysql-test/suite/galera/r/galera_bf_abort_get_lock.result
mysql-test/suite/galera/r/galera_bf_abort_sleep.result
mysql-test/suite/galera/r/galera_enum.result
mysql-test/suite/galera/r/galera_fk_conflict.result
mysql-test/suite/galera/r/galera_insert_multi.result
mysql-test/suite/galera/r/galera_many_indexes.result
mysql-test/suite/galera/r/galera_mdl_race.result
mysql-test/suite/galera/r/galera_nopk_bit.result
mysql-test/suite/galera/r/galera_nopk_blob.result
mysql-test/suite/galera/r/galera_nopk_large_varchar.result
mysql-test/suite/galera/r/galera_nopk_unicode.result
mysql-test/suite/galera/r/galera_pk_bigint_signed.result
mysql-test/suite/galera/r/galera_pk_bigint_unsigned.result
mysql-test/suite/galera/r/galera_serializable.result
mysql-test/suite/galera/r/galera_toi_drop_database.result
mysql-test/suite/galera/r/galera_toi_lock_exclusive.result
mysql-test/suite/galera/r/galera_toi_truncate.result
mysql-test/suite/galera/r/galera_unicode_pk.result
mysql-test/suite/galera/r/galera_var_auto_inc_control_off.result
mysql-test/suite/galera/r/galera_wsrep_log_conficts.result
sql/field.cc
sql/rpl_gtid.cc
sql/share/errmsg-utf8.txt
sql/sql_acl.cc
sql/sql_parse.cc
sql/sql_partition_admin.cc
sql/sql_prepare.cc
sql/sql_repl.cc
sql/sql_table.cc
sql/sql_yacc.yy
Diffstat (limited to 'sql/sql_digest.cc')
| -rw-r--r-- | sql/sql_digest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_digest.cc b/sql/sql_digest.cc index 27c33f1c64b..1b41f7dadfc 100644 --- a/sql/sql_digest.cc +++ b/sql/sql_digest.cc @@ -20,7 +20,7 @@ #include "my_global.h" #include "my_md5.h" -#include "mysqld_error.h" +#include "unireg.h" #include "sql_string.h" #include "sql_class.h" |