diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-03-31 14:32:56 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-03-31 14:32:56 -0400 |
| commit | c704e8bdd7d583e86efb7bae7f391a798c871ffa (patch) | |
| tree | 8312084c71fe1f55eaac7764c3ff21720d9e645c /mysql-test/t/innodb_data_home_dir_basic.test | |
| parent | a97875e55271324588448139e34e0db928213f15 (diff) | |
| parent | 73e1c5ae10994373df5d929974be02edffae70e6 (diff) | |
| download | mariadb-git-c704e8bdd7d583e86efb7bae7f391a798c871ffa.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/field.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/item_create.cc:
Manual merge.
sql/share/errmsg.txt:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
Diffstat (limited to 'mysql-test/t/innodb_data_home_dir_basic.test')
0 files changed, 0 insertions, 0 deletions