Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc

Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc

Recommit of patch:
http://lists.mysql.com/commits/91400

Test case only (code part was pushes as bug-49028)

It was pthread_mutex_t in mi_static.c and 
mysql_mutex_t in my_thr_init.c

Solaris linker complains about different size of the 
symbol.

Fix : use mysql_mutex_t everywhere.

Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status

Post-merge fix: wait for statement result before disconnecting. Otherwise the statement might affect unrelated tests. mysql-test/t/lock_multi.test, Reap statement status

Remove per-project SAFEMALLOCs definitions, as they result in malloc/free mismatches.

Updated suppressed warning messages.

Added extra checks of 64-bit atomic support on GCC and Solaris, also added 64-bit support in solaris.h which was missing

Conflicts:
  - mysys/charset.c
  - mysys/my_thr_init.c

Conflicts:
  - storage/myisam/mi_packrec.c

BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column list partitioning and new function to_seconds

The test allowed random coincidence of connection ids for two concurrent
sessions performing CREATE/DROP temp tables.

Fixed with correcting the test. The sessions connection ids are not changed
from their defaults anymore.