svn merge -r16200:16210 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3

src/database/mysql_common.c

src/database/mysql_common.h

src/plugins/accounting_storage/mysql/mysql_jobacct_process.c

src/slurmdbd/proc_req.c

testsuite/expect/test22.1