[oe-commits] Hongxu Jia : mariadb: fix warning while invoking 'mysql_install_db' on target

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 4e59f5680df8577048821eed12277cee994876d4
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=4e59f5680df8577048821eed12277cee994876d4

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Wed Oct  9 07:30:35 2013 +0000

mariadb: fix warning while invoking 'mysql_install_db' on target

Invoke 'mysql_install_db' on target, there are some warnings:
...
Installing MariaDB/MySQL system tables...
131009  6:13:14 [Warning] '--skip-locking' is deprecated and will be removed in a future release. Please use '--skip-external-locking' instead.
OK
Filling help tables...
131009  6:13:14 [Warning] '--skip-locking' is deprecated and will be removed in a future release. Please use '--skip-external-locking' instead.
OK
...

Modify my.cnf to use '--skip-external-locking' instead of '--skip-locking'
could fix this issue.

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/mysql/mariadb/my.cnf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-support/mysql/mariadb/my.cnf b/meta-oe/recipes-support/mysql/mariadb/my.cnf
index 8470817..d174381 100644
--- a/meta-oe/recipes-support/mysql/mariadb/my.cnf
+++ b/meta-oe/recipes-support/mysql/mariadb/my.cnf
@@ -14,7 +14,7 @@ pid-file 					= /var/lib/mysql/mysqld.pid
 log-error 					= /var/log/mysqld.err
 basedir 					= /usr
 datadir 					= /var/mysql
-skip-locking
+skip-external-locking
 skip-networking
 ignore-builtin-innodb
 bind-address					= localhost