diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-20 10:33:13 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-20 10:33:13 +0300 |
| commit | 246d321f67774990a61c258bd189694523714064 (patch) | |
| tree | 2702d9360d7a953ae5782d3e170d6fbb73843877 /extra | |
| parent | e42c6d1afe99b32f80f70f14fcfa673352d1a7b3 (diff) | |
| parent | c53f57c390adeecbe29d88644576302d8595f794 (diff) | |
| download | mariadb-git-246d321f67774990a61c258bd189694523714064.tar.gz | |
Merge branch '10.2' of github.com:MariaDB/server into 10.2
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index cebbbf3a28c..aa683e320fc 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -1647,7 +1647,7 @@ mdl_lock_init() } } -#ifndef DBUF_OFF +#ifndef DBUG_OFF /* Test that table is really locked, if lock_ddl_per_table is set. The test is executed in DBUG_EXECUTE_IF block inside mdl_lock_table(). */ |