aboutsummaryrefslogtreecommitdiff
path: root/mysql
diff options
context:
space:
mode:
Diffstat (limited to 'mysql')
-rw-r--r--mysql/my.cnf6
-rw-r--r--mysql/my.cnf.mi511
2 files changed, 6 insertions, 11 deletions
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') %>