summaryrefslogtreecommitdiff
path: root/storage/innobase/include/univ.i
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-04-26 07:53:49 +0400
committerunknown <aivanov@mysql.com>2006-04-26 07:53:49 +0400
commitf13569a76b996816657e4526898b59c42d545a2c (patch)
tree50ee9b8e18f94be437fdace0f410e333b9e0511f /storage/innobase/include/univ.i
parent1e869b0e58207ad3d1bb992b4aa164234a71066e (diff)
parent0b64b882578d9149a5edcc7babcd66f6f7c8fcaf (diff)
downloadmariadb-git-f13569a76b996816657e4526898b59c42d545a2c.tar.gz
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
into mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work Null-merge. storage/innobase/dict/dict0load.c: Null-merge.
Diffstat (limited to 'storage/innobase/include/univ.i')
0 files changed, 0 insertions, 0 deletions