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 | 7cce56b2f2da66ce1ee49eb1a82bbf5233791fd8 (patch) | |
| tree | 64aaef636a4bd6b860c62be4faa12109ed8738e7 /mysql-test/include/linux_sys_vars.inc | |
| parent | b71bb3f6fcf6c9f57ce0039fbfe9b089324e1b1e (diff) | |
| parent | 4a77e833f2c05938839d4f8ed8375420734428ad (diff) | |
| download | mariadb-git-7cce56b2f2da66ce1ee49eb1a82bbf5233791fd8.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/include/linux_sys_vars.inc')
0 files changed, 0 insertions, 0 deletions