summaryrefslogtreecommitdiff
path: root/client/client_priv.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-04-21 18:34:06 +0200
committerSergei Golubchik <serg@mariadb.org>2017-04-21 18:34:06 +0200
commit8d75a7533ee80efa5275a058dfadf8947e5857a6 (patch)
tree463cddda9c516dc3cd7c3e94fb08910210473622 /client/client_priv.h
parente056d1f1ca91ebe40467ed46be00be0add9cf247 (diff)
parentc6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff)
downloadmariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'client/client_priv.h')
-rw-r--r--client/client_priv.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h
index 3905f323156..52f73b51ed5 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -117,4 +117,3 @@ enum options_client
Name of the performance schema database.
*/
#define PERFORMANCE_SCHEMA_DB_NAME "performance_schema"
-