summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg.bruehe@oracle.com>2011-12-16 19:54:27 +0100
committerJoerg Bruehe <joerg.bruehe@oracle.com>2011-12-16 19:54:27 +0100
commit540e1541269197428c66d65740c89798f77a9114 (patch)
tree1d389a9c83beb5e682076f2cf8f763e0eee4331b /mysql-test
parentad337489ed22be6e3e35a624a6db0b98b784e5a9 (diff)
parent8bb4100aba6647f2ce28354e948414ff65174eda (diff)
parentb3c3b9f0b1de4fe6498dfb261e08aaa03ccfd9d9 (diff)
downloadmariadb-git-540e1541269197428c66d65740c89798f77a9114.tar.gz
Empty upmerge of 5.0 and 5.1 version number increases, also from main 5.5