diff options
author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 15:01:04 +0200 |
---|---|---|
committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 15:01:04 +0200 |
commit | 8a4c773a7b7c4f2e85ae993d408099a036beb62e (patch) | |
tree | 751f1d44e86a509c4d5a8fbe7fdf1646e2747298 /mysql-test/std_data/vchar.frm | |
parent | 5a206634579d08c38a9f88355173a8e8c655af3f (diff) | |
parent | 1484d54821ff70c2acc43f851ff97fddff0b156c (diff) | |
download | mariadb-git-8a4c773a7b7c4f2e85ae993d408099a036beb62e.tar.gz |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
Makefile.am:
Merged from 4.1
Diffstat (limited to 'mysql-test/std_data/vchar.frm')
0 files changed, 0 insertions, 0 deletions