Fixed merge problems in mysql_clientdb_plugin.inc.php

tbrehm

2012-01-12 4a8b7ecdf842a6ba7cdf0339067c6ed285cf60cb

1
ALTER TABLE  `sys_session` CHANGE  `session_id`  `session_id` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;