client/mysql.cc:
  Auto merged
libmysql/libmysql.c:
  I commited this change 2 weeks ago. 
  I am still waiting for approval to push.
  
  Someone meanwhile pushed different commit, so this merge commit.