diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-09 18:24:50 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-09 18:24:50 -0400 |
| commit | f7c44ce0e9292f5fa418bd1f3ea377f5eeaaa79a (patch) | |
| tree | 64aaef636a4bd6b860c62be4faa12109ed8738e7 /mysql-test/t/table_definition_cache_basic.test | |
| parent | f2ea54a01321692da85275c79a285b8d83dfca4f (diff) | |
| parent | 0aa586c9e80cb00c551b8d8e4507949fb3321f8b (diff) | |
| download | mariadb-git-f7c44ce0e9292f5fa418bd1f3ea377f5eeaaa79a.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my51-bug15776-encore
sql/field.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/r/type_blob.result:
manual merge.
mysql-test/t/type_blob.test:
manual merge.
sql/sql_yacc.yy:
merge by hand.
Diffstat (limited to 'mysql-test/t/table_definition_cache_basic.test')
0 files changed, 0 insertions, 0 deletions