summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-06-01 16:40:34 +0400
committerAlexander Nozdrin <alik@sun.com>2010-06-01 16:40:34 +0400
commitff6cf4bb462cf2d6fc0b761c40639f268eb0b5f5 (patch)
treed84fab8d1dbc6c4671f60a537b3ce6707f82e2af /sql
parent5cf1d385706097faab68dbca1053a2842a2dbd34 (diff)
parentbf158eed8388f6c1b4c776b9ff6ee16a335cffa8 (diff)
downloadmariadb-git-ff6cf4bb462cf2d6fc0b761c40639f268eb0b5f5.tar.gz
Auto-merge from mysql-trunk-innodb.
Diffstat (limited to 'sql')
0 files changed, 0 insertions, 0 deletions