From 69e31320674aec6c2d22639e7e50e6615ba6e1a2 Mon Sep 17 00:00:00 2001 From: lissav Date: Tue, 1 Dec 2009 19:25:15 +0000 Subject: [PATCH] remove setting of ANSI_QUOTES in my.cnf git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4704 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/sbin/mysqlsetup | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/xCAT-server/sbin/mysqlsetup b/xCAT-server/sbin/mysqlsetup index 5311d136b..2211ebfac 100755 --- a/xCAT-server/sbin/mysqlsetup +++ b/xCAT-server/sbin/mysqlsetup @@ -633,42 +633,6 @@ sub initmysqldb } - # for Linux and AIX, insert sql_mode=ANSI_QUOTES in the [mysqld] stanza - # of the /etc/my.cnf file,if it is not already there - - $cmd = "fgrep ANSI_QUOTES /etc/my.cnf"; - xCAT::Utils->runcmd($cmd, -1); - if ($::RUNCMD_RC != 0) - { - if ($::osname eq 'AIX') - { - - $cmd = - "awk '{gsub(\"\\\\[mysqld]\",\"\\[mysqld]\\nsql_mode = ANSI_QUOTES \"); print}' /etc/my.cnf > /etc/my.cnf.xcat"; - } - else - { - - # linux different, above gives warning - $cmd = - "awk '{gsub(\"\\\\[mysqld]\",\"[mysqld]\\nsql_mode = ANSI_QUOTES \"); print}' /etc/my.cnf > /etc/my.cnf.xcat"; - } - xCAT::Utils->runcmd($cmd, 0); - if ($::RUNCMD_RC != 0) - { - - xCAT::MsgUtils->message("E", " $cmd failed."); - exit(1); - } - $cmd = "cp -p /etc/my.cnf.xcat /etc/my.cnf"; - xCAT::Utils->runcmd($cmd, 0); - if ($::RUNCMD_RC != 0) - { - - xCAT::MsgUtils->message("E", " $cmd failed."); - exit(1); - } - } # for AIX, insert datadir=/var/lib/mysql in the [mysqld] stanza # of the /etc/my.cnf file,if it is not already there