Conflicts:
  - storage/myisam/mi_static.c

recompile partition plugin for embedded server, its behavior depends on WITH_EMBEDDED_SERVER preprocessor definition

into mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo
parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Tue 2009-12-22 12:53:11 +0100
message:
  Bug#49834 - fixed a bug introduced by mismerge.
  restore original innobase version
------------------------------------------------------------

fix loadxml test, it tries to disconnect without reading results. when EXTRA_DEBUG is enabled, mtr complains

by shared embedded library)

restore original innobase version

Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc

Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc

Force use of c-register in CAS instruction on x86-32 bit architecture, b-register used for push and pop, so don't want to give compile the chance to choose the wrong register

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

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

mysql-test/r/partition_column.result:
  Bug#48737: Partitions: search fails with ucs2
  
  added test case
mysql-test/t/partition_column.test:
  Bug#48737: Partitions: search fails with ucs2
  
  Added result

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.