equal
deleted
inserted
replaced
33 db_get littlebird-tc/db/host && host="$RET" || true |
33 db_get littlebird-tc/db/host && host="$RET" || true |
34 db_get littlebird-tc/db/name && name="$RET" || true |
34 db_get littlebird-tc/db/name && name="$RET" || true |
35 |
35 |
36 # check admin access |
36 # check admin access |
37 if ! _mysql -e "" mysql 2>$tmp; then |
37 if ! _mysql -e "" mysql 2>$tmp; then |
|
38 db_set littlebird-tc/db/have-admin false || true |
38 db_subst littlebird-tc/db/failure message "`cat $tmp`" || true |
39 db_subst littlebird-tc/db/failure message "`cat $tmp`" || true |
39 db_subst littlebird-tc/db/failure name "$name" || true |
40 db_subst littlebird-tc/db/failure name "$name" || true |
40 db_subst littlebird-tc/db/failure host "$host" || true |
41 db_subst littlebird-tc/db/failure host "$host" || true |
41 db_input critical littlebird-tc/db/failure || true |
42 db_input critical littlebird-tc/db/failure || true |
42 db_go || true |
43 db_go || true |
63 CREATE DATABASE $name; |
64 CREATE DATABASE $name; |
64 GRANT ALL ON $name.* TO '$user'@'$client' IDENTIFIED BY '$pass'; |
65 GRANT ALL ON $name.* TO '$user'@'$client' IDENTIFIED BY '$pass'; |
65 FLUSH PRIVILEGES; |
66 FLUSH PRIVILEGES; |
66 EOF |
67 EOF |
67 |
68 |
68 /usr/share/littlebird/tc-sql/install_test_iteration_2011-06.sh \ |
69 /usr/share/littlebird-tc/sql/install_test_iteration_2011-06.sh \ |
69 --host "$host" --db "$name" \ |
70 --host "$host" --db "$name" \ |
70 --adminuser "$adminuser" --adminpass "$adminpass" \ |
71 --adminuser "$adminuser" --adminpass "$adminpass" \ |
71 --user "$user" --pass "$pass" |
72 --user "$user" --pass "$pass" |
72 |
73 |
73 # avoid stupid messages next time |
74 # avoid stupid messages next time |