Merge lp:~clint-fewbar/ubuntu/maverick/mysql-5.1/maverick-beta-papercuts into lp:ubuntu/maverick/mysql-5.1

[Clint Byrum]

Fixes linked bugs, both of which are fairly trivial.

Built and tested on maverick:

clint@ubuntu:~/pkg/mysql-5.1/bzr/maverick$ mysql_config
Usage: /usr/bin/mysql_config [OPTIONS]
Options:
        --cflags [-I/usr/include/mysql -DBIG_JOINS=1 -fno-strict-aliasing -DUNIV_LINUX -DUNIV_LINUX]
        --include [-I/usr/include/mysql]
        --libs [-Wl,-Bsymbolic-functions -rdynamic -L/usr/lib/mysql -lmysqlclient]
        --libs_r [-Wl,-Bsymbolic-functions -rdynamic -L/usr/lib/mysql -lmysqlclient_r]
        --plugindir [/usr/lib/mysql/plugin]
        --socket [/var/run/mysqld/mysqld.sock]
        --port [0]
        --version [5.1.49]
        --libmysqld-libs [-Wl,-Bsymbolic-functions -rdynamic -L/usr/lib/mysql -lmysqld -ldl -lwrap -lrt]
clint@ubuntu:~/pkg/mysql-5.1/bzr/maverick$ mysql_config_pic
Usage: /usr/bin/mysql_config_pic [OPTIONS]
Options:
        --cflags [-I/usr/include/mysql -DBIG_JOINS=1 -fPIC -fno-strict-aliasing -DUNIV_LINUX -DUNIV_LINUX]
        --include [-I/usr/include/mysql]
        --libs [-rdynamic -L/usr/lib/mysql -lmysqlclient]
        --libs_r [-rdynamic -L/usr/lib/mysql -lmysqlclient_r]
        --plugindir [/usr/lib/mysql/plugin]
        --socket [/var/run/mysqld/mysqld.sock]
        --port [0]
        --version [5.1.49]
        --libmysqld-libs [-rdynamic -L/usr/lib/mysql -lmysqld -ldl -lwrap -lrt]

[lp:~clint-fewbar/ubuntu/maverick/mysql-5.1/maverick-beta-papercuts]

16. By Clint Byrum on 2010-08-20

Changed default setting for tmpdir /var/tmp/mysql (LP: #375371)

17. By Clint Byrum on 2010-08-20

* debian/mysql-server.5.1.postinst: Specify the mysql user when installing
  the mysql databases. (LP: #591875)
* debian/apparmor-profile: Update apparmor profile for mysql plugins.
  (LP: #594932, #619172)
* Use debhelper where possible in rules
* Split binary packages into mysql-base, mysql-client, mysql-doc
* New upstream release

[Clint Byrum (clint-fewbar)]

I just pushed an updated branch that locks mysqld down to /var/tmp/mysql, which will be created 750 in the upstart script (in case /var/tmp is cleared).

[lp:~clint-fewbar/ubuntu/maverick/mysql-5.1/maverick-beta-papercuts]

18. By Clint Byrum on 2010-08-20

Changing default tmpdir

[Thierry Carrez (ttx)]

Looking good, I'll update for current trunk and fix changelog, then upload.

review: Approve

[Thierry Carrez (ttx)]

Hmm, after a couple hours it fails to build with the following test failure:

rpl.rpl_innodb_bug28430 [ fail ] timeout after 900 seconds

mysqltest: Could not open connection 'default' after 500 attempts: 2002 Can't connect to local MySQL server through socket '/tmp/iVh6FPzXYn/mysqld.1.sock' (111)

Completed: Failed 1/711 tests, 99.86% were successful.

review: Disapprove

Unmerged revisions

18. By Clint Byrum on 2010-08-20

Changing default tmpdir

17. By Clint Byrum on 2010-08-20

* debian/mysql-server.5.1.postinst: Specify the mysql user when installing
  the mysql databases. (LP: #591875)
* debian/apparmor-profile: Update apparmor profile for mysql plugins.
  (LP: #594932, #619172)
* Use debhelper where possible in rules
* Split binary packages into mysql-base, mysql-client, mysql-doc
* New upstream release

16. By Clint Byrum on 2010-08-20

Changed default setting for tmpdir /var/tmp/mysql (LP: #375371)

15. By Clint Byrum on 2010-08-13

* Changed default setting for tmpdir /var/tmp (LP: #375371)
* Installing mysql_config_pic in /usr/bin so users of libmysqld-pic
  can extract the appropriate compile flags. (LP: #605021)

=== modified file 'debian/additions/my.cnf'
--- debian/additions/my.cnf	2010-05-26 09:27:48 +0000
+++ debian/additions/my.cnf	2010-08-20 17:26:41 +0000
@@ -44,7 +44,7 @@
 port		= 3306
 basedir		= /usr
 datadir		= /var/lib/mysql
-tmpdir		= /tmp
+tmpdir		= /var/tmp/mysql
 skip-external-locking
 #
 # Instead of skip-networking the default is now to listen only on

=== modified file 'debian/apparmor-profile'
--- debian/apparmor-profile	2010-08-20 10:12:48 +0000
+++ debian/apparmor-profile	2010-08-20 17:26:41 +0000
@@ -5,7 +5,6 @@
 /usr/sbin/mysqld {
   #include <abstractions/base>
   #include <abstractions/nameservice>
-  #include <abstractions/user-tmp>
   #include <abstractions/mysql>
   #include <abstractions/winbind>
 
@@ -34,6 +33,8 @@
   /var/log/mysql/* rw,
   /var/run/mysqld/mysqld.pid w,
   /var/run/mysqld/mysqld.sock w,
+  /var/tmp/mysql/ r,
+  /var/tmp/mysql/** rwk,
 
   /sys/devices/system/cpu/ r,
 

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-20 10:12:48 +0000
+++ debian/changelog	2010-08-20 17:26:41 +0000
@@ -1,3 +1,9 @@
+mysql-5.1 (5.1.49-1ubuntu7) maverick; urgency=low
+
+  * Changed default setting for tmpdir /var/tmp/mysql (LP: #375371)
+
+ -- Clint Byrum <[e-mail]>  Fri, 20 Aug 2010 10:17:00 -0700
+
 mysql-5.1 (5.1.49-1ubuntu6) maverick; urgency=low
 
   [Clint Byrum]
@@ -12,15 +18,6 @@
 
  -- Chuck Short <[e-mail]>  Fri, 20 Aug 2010 10:12:48 -0400
 
-mysql-5.1 (5.1.49-1ubuntu5) maverick; urgency=low
-
-  * New patch: 99_fix_testsuite_for_installed_env.dpatch: fix
-    mysql-testsuite to work with the installation location (LP: #617461)
-  * debian/apparmor-profile: add mmap access to mysql plugin location
-    (LP: #617463)
-
- -- Steve Beattie <[e-mail]>  Thu, 12 Aug 2010 15:44:46 -0700
-
 mysql-5.1 (5.1.49-1ubuntu4) maverick; urgency=low
 
   * debian/rules: doy. Put dh_apparmor in binary-arch so more than just
@@ -3102,18 +3099,6 @@
 
 mysql-dfsg (4.0.20-8) unstable; urgency=low
 
-  * The mysqlcheck that is started from the initscript will now be
-    backgrounded because it might else prevent the boot process to continue.
-    It also now notifies root by mail and syslog if a table is corrupt.
-  * The "debian-sys-maint" MySQL user now has almost full rights so that other
-    packages might use this account to create databases and user (thanks to
-    Andreas Barth). Closes: #262541
-  * Added paranoid rules for logcheck.
-
- -- Christian Hammers <[e-mail]>  Sun,  1 Aug 2004 21:00:55 +0200
-
-mysql-dfsg (4.0.20-8) unstable; urgency=low
-
   * Upload stalled. Not released.
 
  -- Christian Hammers <[e-mail]>  Sun,  1 Aug 2004 20:27:55 +0200
@@ -4638,6 +4623,14 @@
   
  -- Scott Hanson <[e-mail]>  Wed, 28 Jan 1998 18:59:09 +0100
 
+mysql (3.21.21.beta-1) unstable; urgency=low
+
+  * Use debhelper where possible in rules
+  * Split binary packages into mysql-base, mysql-client, mysql-doc	
+  * New upstream release
+
+ -- Scott Hanson <[e-mail]>  Thu, 15 Jan 1998 08:12:17 +0100
+
 mysql (3.21.21a.beta-2) unstable; urgency=low
 
   * Compile with libpthreads from libc6-dev_2.0.6-3 rather than statically 
@@ -4653,14 +4646,6 @@
 
  -- Scott Hanson <[e-mail]>  Mon, 19 Jan 1998 07:52:48 +0100
 
-mysql (3.21.21.beta-1) unstable; urgency=low
-
-  * Use debhelper where possible in rules
-  * Split binary packages into mysql-base, mysql-client, mysql-doc	
-  * New upstream release
-
- -- Scott Hanson <[e-mail]>  Thu, 15 Jan 1998 08:12:17 +0100
-
 mysql (3.21.19.beta-1) unstable; urgency=low
 
   * Offer to set root password in mysql_install_db

=== modified file 'debian/mysql-server-5.1.mysql.upstart'
--- debian/mysql-server-5.1.mysql.upstart	2010-08-01 11:23:11 +0000
+++ debian/mysql-server-5.1.mysql.upstart	2010-08-20 17:26:41 +0000
@@ -17,6 +17,7 @@
     #Sanity checks
     [ -r $HOME/my.cnf ]
     [ -d /var/run/mysqld ] || install -m 755 -o mysql -g root -d /var/run/mysqld
+    [ -d /var/tmp/mysql ] || install -m 750 -o mysql -g mysql -d /var/tmp/mysql
     # Load AppArmor profile
     if aa-status --enabled 2>/dev/null; then
         apparmor_parser -r /etc/apparmor.d/usr.sbin.mysqld || true