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

[Clint Byrum]

You have been requested to review the proposed merge of lp:~clint-fewbar/ubuntu/maverick/mysql-5.1/maverick-beta-papercuts into lp:ubuntu/mysql-5.1.

Fixes linked bugs, both of which are fairly trivial.

Built and tested on maverick:


clint at 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 at 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]


-- 
https://code.launchpad.net/~clint-fewbar/ubuntu/maverick/mysql-5.1/maverick-beta-papercuts/+merge/32558
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~clint-fewbar/ubuntu/maverick/mysql-5.1/maverick-beta-papercuts into lp:ubuntu/mysql-5.1.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 2439 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/ubuntu-sponsors/attachments/20100813/d474fe5f/attachment.diff