From 2c64dade10d0899284a4b7ef6f3464ff5dfd7cf7 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 26 Jun 2017 23:40:10 +1200 Subject: Revert "Allow MYSQL_* my.cnf vars" This reverts commit bc204d546eacaf82ced744838cd5a06ff8bcdde0. Scratch that; this approach doesn't work because if the strings are empty from the Makefile macro, m4 still considers them defined. A different approach is needed here. --- mysql/my.cnf | 6 ++++++ mysql/my.cnf.mi5 | 11 ----------- 2 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 mysql/my.cnf delete mode 100644 mysql/my.cnf.mi5 (limited to 'mysql') diff --git a/mysql/my.cnf b/mysql/my.cnf new file mode 100644 index 00000000..900cf1a9 --- /dev/null +++ b/mysql/my.cnf @@ -0,0 +1,6 @@ +[mysql] +default-character-set=utf8 +no-auto-rehash +prompt='(\u@\h:\d) mysql> ' +safe-updates +skip-pager diff --git a/mysql/my.cnf.mi5 b/mysql/my.cnf.mi5 deleted file mode 100644 index 810f5165..00000000 --- a/mysql/my.cnf.mi5 +++ /dev/null @@ -1,11 +0,0 @@ -[mysql] -default-character-set=utf8 -no-auto-rehash -prompt='(\u@\h:\d) mysql> ' -safe-updates -skip-pager - -[client] -<% ifdef(`MYSQL_HOST', ``host='MYSQL_HOST', `dnl') %> -<% ifdef(`MYSQL_USER', ``user='MYSQL_USER', `dnl') %> -<% ifdef(`MYSQL_PASSWORD', ``password='MYSQL_PASSWORD', `dnl') %> -- cgit v1.2.3