Re: [Maria-developers] [Commits] Rev 89: MBug#674413: better fix following review: clear sql_mode rather than add every column explicitly. in http://bazaar.launchpad.net/~maria-captains/maria/5.1
Hi, knielsen! On Nov 20, knielsen@knielsen-hq.org wrote:
At http://bazaar.launchpad.net/~maria-captains/maria/5.1
------------------------------------------------------------ revno: 89 revision-id: knielsen@knielsen-hq.org-20101120084531-x0hbb64q9x0yj376 parent: knielsen@knielsen-hq.org-20101119133933-wb5g8sdjynao018w committer: knielsen@knielsen-hq.org branch nick: ourdelta-montyprogram-fixes timestamp: Sat 2010-11-20 09:45:31 +0100 message: MBug#674413: better fix following review: clear sql_mode rather than add every column explicitly. === modified file 'bakery/debian-5.2/dist/Debian/mariadb-server-5.2.postinst' --- a/bakery/debian-5.2/dist/Debian/mariadb-server-5.2.postinst 2010-11-19 13:39:33 +0000 +++ b/bakery/debian-5.2/dist/Debian/mariadb-server-5.2.postinst 2010-11-20 08:45:31 +0000 @@ -195,6 +195,7 @@ EOF "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`; replace_query=`/bin/echo -e \ "USE mysql\n" \ + "SET sql_mode='';\n" \ "REPLACE INTO user SET " \ " host='localhost', user='debian-sys-maint', password=password('$pass'), " \ " Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \ @@ -205,9 +206,7 @@ EOF " Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\ " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\ " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y',"\ - " ssl_type='', ssl_cipher='', x509_issuer='', x509_subject='',"\ - " max_questions=0, max_updates=0, max_connections=0,"\ - " max_user_connections=0, plugin='', auth_string='';"`; + " ssl_cipher='', x509_issuer='', x509_subject='';"`;
There's no need to set ssl_cipher and other blob columns - they'll get the empty string by default anyway. Regards, Sergei
Sergei Golubchik
Hi, knielsen!
On Nov 20, knielsen@knielsen-hq.org wrote:
At http://bazaar.launchpad.net/~maria-captains/maria/5.1
------------------------------------------------------------ revno: 89 revision-id: knielsen@knielsen-hq.org-20101120084531-x0hbb64q9x0yj376 parent: knielsen@knielsen-hq.org-20101119133933-wb5g8sdjynao018w committer: knielsen@knielsen-hq.org branch nick: ourdelta-montyprogram-fixes timestamp: Sat 2010-11-20 09:45:31 +0100 message: MBug#674413: better fix following review: clear sql_mode rather than add every column explicitly. === modified file 'bakery/debian-5.2/dist/Debian/mariadb-server-5.2.postinst' --- a/bakery/debian-5.2/dist/Debian/mariadb-server-5.2.postinst 2010-11-19 13:39:33 +0000 +++ b/bakery/debian-5.2/dist/Debian/mariadb-server-5.2.postinst 2010-11-20 08:45:31 +0000 @@ -195,6 +195,7 @@ EOF "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`; replace_query=`/bin/echo -e \ "USE mysql\n" \ + "SET sql_mode='';\n" \ "REPLACE INTO user SET " \ " host='localhost', user='debian-sys-maint', password=password('$pass'), " \ " Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \ @@ -205,9 +206,7 @@ EOF " Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\ " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\ " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y',"\ - " ssl_type='', ssl_cipher='', x509_issuer='', x509_subject='',"\ - " max_questions=0, max_updates=0, max_connections=0,"\ - " max_user_connections=0, plugin='', auth_string='';"`; + " ssl_cipher='', x509_issuer='', x509_subject='';"`;
There's no need to set ssl_cipher and other blob columns - they'll get the empty string by default anyway.
Right. It's just that they were already like this (before I started looking at MBug#674413), and I didn't want to change anything more than necessary. I just reverted my own changes. - Kristian.
participants (2)
-
Kristian Nielsen -
Sergei Golubchik