MySQL support
update mysql support 2
Merge from MySQL branch