add
Merge https://github.com/yuanrongxi/innodb

Conflicts:
	innodb.suo
add text