[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

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Sat Nov 20 10:45:31 EET 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 89
revision-id: knielsen at knielsen-hq.org-20101120084531-x0hbb64q9x0yj376
parent: knielsen at knielsen-hq.org-20101119133933-wb5g8sdjynao018w
committer: knielsen at 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='';"`;
     # Engines supported by etch should be installed per default. The query sequence is supposed
     # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
     # admin might already have chosen to remove one or more plugins. Newlines are necessary.

=== modified file 'bakery/debian-5.2/dist/Ubuntu/mariadb-server-5.2.postinst'
--- a/bakery/debian-5.2/dist/Ubuntu/mariadb-server-5.2.postinst	2010-11-19 13:39:33 +0000
+++ b/bakery/debian-5.2/dist/Ubuntu/mariadb-server-5.2.postinst	2010-11-20 08:45:31 +0000
@@ -196,6 +196,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', " \
@@ -206,9 +207,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='';"`;
     # Engines supported by etch should be installed per default. The query sequence is supposed
     # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
     # admin might already have chosen to remove one or more plugins. Newlines are necessary.

=== modified file 'bakery/debian-5.3/dist/Debian/mariadb-server-5.3.postinst'
--- a/bakery/debian-5.3/dist/Debian/mariadb-server-5.3.postinst	2010-11-19 13:39:33 +0000
+++ b/bakery/debian-5.3/dist/Debian/mariadb-server-5.3.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='';"`;
     # Engines supported by etch should be installed per default. The query sequence is supposed
     # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
     # admin might already have chosen to remove one or more plugins. Newlines are necessary.

=== modified file 'bakery/debian-5.3/dist/Ubuntu/mariadb-server-5.3.postinst'
--- a/bakery/debian-5.3/dist/Ubuntu/mariadb-server-5.3.postinst	2010-11-19 13:39:33 +0000
+++ b/bakery/debian-5.3/dist/Ubuntu/mariadb-server-5.3.postinst	2010-11-20 08:45:31 +0000
@@ -196,6 +196,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', " \
@@ -206,9 +207,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='';"`;
     # Engines supported by etch should be installed per default. The query sequence is supposed
     # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
     # admin might already have chosen to remove one or more plugins. Newlines are necessary.



More information about the commits mailing list