ddl: resolve conflict.
ddl: resolve conflict.

ngaut/tidb,spongedu/tidb,simon-xia/tidb,andelf/tidb,pingcap/tidb,kyle-wang/tidb,kyle-wang/tidb,zs634134578/tidb,spongedu/tidb,ngaut/tidb,EvilMcJerkface/tidb,louishust/tidb,zimulala/tidb,c4pt0r/tidb,zimulala/tidb,ngaut/tidb,anywhy/tidb,yangwenmai/tidb,cosmtrek/tidb,c4pt0r/tidb,c4pt0r/tidb,mccxj/tidb,Nify/tidb,silentred/tidb,silenceper/tidb,astaxie/tidb,ming-relax/tidb,liyu4/tidb,ueizhou/tidb,XuHuaiyu/tidb,gaocegege/tidb,gaocegege/tidb,simon-xia/tidb,c4pt0r/tidb,qhsong/tidb,pingcap/tidb,silentred/tidb,qiuyesuifeng/tidb,coocood/tidb,8cbx/tidb,qhsong/tidb,pingcap/tidb,ngaut/tidb,silenceper/tidb,wusphinx/tidb,mccxj/tidb,tiancaiamao/tidb,wusphinx/tidb,ming-relax/tidb,c4pt0r/tidb,cosmtrek/tidb,pingcap/tidb,ngaut/tidb,kyle-wang/tidb,yuanwhy/tidb,louishust/tidb,XuHuaiyu/tidb,myrice/tidb,kyle-wang/tidb,coocood/tidb,kyle-wang/tidb,anywhy/tidb,pingcap/tidb,CodeRushing/tidb,Cofyc/tidb,c4pt0r/tidb,CodeRushing/tidb,tiancaiamao/tidb,EvilMcJerkface/tidb,Cofyc/tidb,Nify/tidb,myrice/tidb,qiuyesuifeng/tidb,kyle-wang/tidb,ngaut/tidb,zs634134578/tidb,yangwenmai/tidb,ueizhou/tidb,8cbx/tidb,JinheLin/tidb,JinheLin/tidb,astaxie/tidb,andelf/tidb,liyu4/tidb,yuanwhy/tidb,pingcap/tidb