Merge lp:~ignacio-nin/percona-server/5.1-bug1169522 into lp:percona-server/5.1

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 549
Merged at revision: 579
Proposed branch: lp:~ignacio-nin/percona-server/5.1-bug1169522
Merge into: lp:percona-server/5.1
Diff against target: 19 lines (+7/-1)
1 file modified
build/percona-server.spec (+7/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.1-bug1169522
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+172264@code.launchpad.net

Description of the change

Fix for bug #1169522. The way this was implemented is that mysql_install_db is not called if the $datadir/mysql directory exists. Also useless calls to mkdir for the mysql and test databases were removed.

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/percona-server.spec'
2--- build/percona-server.spec 2013-06-06 16:43:26 +0000
3+++ build/percona-server.spec 2013-07-01 02:34:30 +0000
4@@ -618,8 +618,14 @@
5 # Initiate databases
6 # ----------------------------------------------------------------------
7 if [ $1 -eq 1 ]; then #clean installation
8- mkdir -p $mysql_datadir/{mysql,test}
9+ # Does $mysql_datadir/mysql exist? In this case, this is probably an
10+ # upgrade from a previous version or a reinstall. It's best not to
11+ # call mysql_install_db in this case since the test db would be
12+ # possibly recreated (bug #1169522).
13+ if test ! -e $mysql_datadir/mysql
14+ then
15 %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
16+ fi
17 fi
18 # ----------------------------------------------------------------------
19 # FIXME upgrade databases if needed would go here - but it cannot be

Subscribers

People subscribed via source and target branches