diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 17:50:07 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 17:50:07 -0400 |
| commit | db0182330d4f160d061acc498c84641a4ce8d9ed (patch) | |
| tree | b1056b72891bc5025bd390ad89d90771d6adb146 /include/violite.h | |
| parent | 9111f7118193ee83754a343a0a9794dc57311208 (diff) | |
| parent | 5bd9bf5572a2c7aa917cdeee2b116646953b2e69 (diff) | |
| download | mariadb-git-db0182330d4f160d061acc498c84641a4ce8d9ed.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
client/mysql.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
vio/viosocket.c:
Auto merged
mysql-test/r/ctype_recoding.result:
Manual merge.
mysql-test/t/ctype_recoding.test:
Manual merge.
Diffstat (limited to 'include/violite.h')
0 files changed, 0 insertions, 0 deletions