summaryrefslogtreecommitdiff
path: root/pstack
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-06 13:28:06 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-06 13:28:06 +0300
commita72f90bc43a809e6678e1343a1ee760878061be3 (patch)
tree16fe2efa0a3d5e40e00972a1dc3bc4e13f71170c /pstack
parentba678eef7de4a8c5fbea07928b87fef84765f22b (diff)
parentb38ef2b5f7bc231b63b770c28688ee9f0109c88b (diff)
downloadmariadb-git-a72f90bc43a809e6678e1343a1ee760878061be3.tar.gz
Merge next-mr -> next-4284.
mysql-test/t/disabled.def: Restore disabled ssl tests: SSL certificates were updated. Disable sp_sync.test, the test case can't work in next-4284. mysql-test/t/partition_innodb.test: Disable parsing of the test case for Bug#47343, the test can not work in next-4284. mysql-test/t/ps_ddl.test: Update results (CREATE TABLE IF NOT EXISTS takes into account existence of the temporary table).
Diffstat (limited to 'pstack')
0 files changed, 0 insertions, 0 deletions