summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-04-20 23:18:29 +0400
committerunknown <aivanov@mysql.com>2006-04-20 23:18:29 +0400
commit6b63f270c6c9d31c72bb2ca5131c490e367be515 (patch)
tree2bd554571e30b03f6d7c0b9cff77610e913e6db3 /innobase/include
parent10633fd8397f8450b5076bb98f336f6d20967b5d (diff)
parent66ee876ba3b50fba4ed159eb23587bf02fc2d44b (diff)
downloadmariadb-git-6b63f270c6c9d31c72bb2ca5131c490e367be515.tar.gz
Merge mysql.com:/home/alexi/innodb/mysql-4.1-work
into mysql.com:/home/alexi/innodb/mysql-5.0-work Null-merge. innobase/dict/dict0dict.c: Null-merge. innobase/dict/dict0mem.c: Null-merge. innobase/include/dict0dict.h: Null-merge. innobase/include/dict0mem.h: Null-merge. innobase/include/univ.i: Null-merge. innobase/row/row0mysql.c: Null-merge.
Diffstat (limited to 'innobase/include')
0 files changed, 0 insertions, 0 deletions