merge mysql's sql
Merge branch 'nari'