Skip to content
Blame Permalink
  • Dyre Tjeldvoll's avatar
    23cbe612
    Merge ../bug_25092566__5.6 into mysql-5.7 · 23cbe612
    Dyre Tjeldvoll authored 
    Conflicts:
	mysql-test/suite/parts/r/partition-dml-1-11-innodb.result
	mysql-test/suite/parts/r/partition-dml-1-11-myisam.result
	sql/partition_info.cc
	sql/partition_info.h
	sql/sql_parse.cc

(cherry picked from commit fda03524ec0e601b933189a53bea2c28c6deda4e)
    23cbe612
    Merge ../bug_25092566__5.6 into mysql-5.7
    Dyre Tjeldvoll authored 
    Conflicts:
	mysql-test/suite/parts/r/partition-dml-1-11-innodb.result
	mysql-test/suite/parts/r/partition-dml-1-11-myisam.result
	sql/partition_info.cc
	sql/partition_info.h
	sql/sql_parse.cc

(cherry picked from commit fda03524ec0e601b933189a53bea2c28c6deda4e)