summaryrefslogtreecommitdiff
path: root/storage/xtradb/lock/lock0lock.c
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2011-12-15 17:12:04 +0100
committerMattias Jonsson <mattias.jonsson@oracle.com>2011-12-15 17:12:04 +0100
commit41e46f32038a9637c00b6204856cfdb1b6425bd8 (patch)
treec7efca70ed66eaf11d68daefff4f2410b83adb9a /storage/xtradb/lock/lock0lock.c
parent7a2664746bae36fd5d9eea6d7e089e26a019e9b7 (diff)
parente5cb28793385566e22d5a82efdf3f6cb8dbe5cbc (diff)
downloadmariadb-git-41e46f32038a9637c00b6204856cfdb1b6425bd8.tar.gz
merge. Disabled the added test in merge.test from 5.1.
Diffstat (limited to 'storage/xtradb/lock/lock0lock.c')
0 files changed, 0 insertions, 0 deletions