diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 20:17:55 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 20:17:55 +0400 |
| commit | 77b0e893286ad25453e8f736e93aa5970ebe18b8 (patch) | |
| tree | 1cb84ff0f047fa8321330c5e4c52eca6424494de /mysql-test/t/warnings.test | |
| parent | e58c0596954d22262199a7228427e9a1c29d8c76 (diff) | |
| parent | 5dd5d70506611ea68c7103fcf97512e3114fffae (diff) | |
| download | mariadb-git-77b0e893286ad25453e8f736e93aa5970ebe18b8.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/t/explain.test
Text conflict in sql/net_serv.cc
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_priv.h
Diffstat (limited to 'mysql-test/t/warnings.test')
0 files changed, 0 insertions, 0 deletions