diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-27 14:13:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-27 14:13:26 +0200 |
| commit | b84e5a4e8f516e23cfde13edf4e171be19f0f828 (patch) | |
| tree | 4e2e63130e8836bfee133af3071934e1b8788b18 /debian | |
| parent | 3f1290340efa50939dc00e13fec7ea69306fa624 (diff) | |
| download | mariadb-git-b84e5a4e8f516e23cfde13edf4e171be19f0f828.tar.gz | |
fix debian/ubuntu startup scripts
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/control | 2 | ||||
| -rw-r--r-- | debian/dist/Debian/mariadb-server-10.0.postinst | 6 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/mariadb-server-10.0.postinst | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 42862a12f53..f729f81f55d 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -98,7 +98,7 @@ Architecture: any Depends: mariadb-common, libmariadbclient18 (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: mysql-client-core, mysql-client-core-5.1, mysql-client-core-10.0 Conflicts: mysql-client (<< 5.0.51), mysql-client-5.0, - mysql-client-5.1, mysql-client-5.5, + mysql-client-5.1 (<< ${source:Version}), mysql-client-5.5 (<< ${source:Version}), mysql-client-core-5.1, mysql-client-core-5.5, mariadb-client-5.1, mariadb-client-core-5.1, mariadb-client-5.2, mariadb-client-core-5.2, diff --git a/debian/dist/Debian/mariadb-server-10.0.postinst b/debian/dist/Debian/mariadb-server-10.0.postinst index 81d028f6f3f..fb1f710eb89 100644 --- a/debian/dist/Debian/mariadb-server-10.0.postinst +++ b/debian/dist/Debian/mariadb-server-10.0.postinst @@ -191,10 +191,10 @@ EOF # update privilege tables password_column_fix_query=`/bin/echo -e \ - "USE mysql\n" \ - "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`; + "USE mysql;\n" \ + "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" \ + "USE mysql;\n" \ "SET sql_mode='';\n" \ "REPLACE INTO user SET " \ " host='localhost', user='debian-sys-maint', password=password('$pass'), " \ diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.postinst b/debian/dist/Ubuntu/mariadb-server-10.0.postinst index 7933bb2dce2..a827f3c8356 100644 --- a/debian/dist/Ubuntu/mariadb-server-10.0.postinst +++ b/debian/dist/Ubuntu/mariadb-server-10.0.postinst @@ -192,10 +192,10 @@ EOF # update privilege tables password_column_fix_query=`/bin/echo -e \ - "USE mysql\n" \ - "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`; + "USE mysql;\n" \ + "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" \ + "USE mysql;\n" \ "SET sql_mode='';\n" \ "REPLACE INTO user SET " \ " host='localhost', user='debian-sys-maint', password=password('$pass'), " \ |