diff options
| author | unknown <thek@adventure.(none)> | 2007-12-10 16:47:45 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-12-10 16:47:45 +0100 |
| commit | ede6f50a6a92aef2bf1105d4da98796ca309c3bd (patch) | |
| tree | cb84a9b3a72937c9eea357ecf31cfc36a334716f /mysql-test/r/no-threads.result | |
| parent | d0e99dfa26f563a9a82996fe9e039ec783aa14f0 (diff) | |
| parent | dcc2e663916925c152c14599751ab107e0ae7999 (diff) | |
| download | mariadb-git-ede6f50a6a92aef2bf1105d4da98796ca309c3bd.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
mysql-test/r/read_only.result:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/t/read_only.test:
Manual merge
Diffstat (limited to 'mysql-test/r/no-threads.result')
0 files changed, 0 insertions, 0 deletions