oracle initial commit
Merge branch 'master' into oracle
mysql initial commit 2