diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 19:28:40 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 19:28:40 +0300 |
| commit | f62f1a528b7154e9ffdc61cc17fb629fa6dd5583 (patch) | |
| tree | 1c4a1b44a1c27efa75b6d35089126bc9d68eebcf /mysql-test | |
| parent | 31ba3bf5cb51ed8ccc7f2d6c05b92e18794889a0 (diff) | |
| parent | 632cf4c5023ca8e714c5e250662ece59678f7c59 (diff) | |
| download | mariadb-git-f62f1a528b7154e9ffdc61cc17fb629fa6dd5583.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- sql/mysqld.cc
Diffstat (limited to 'mysql-test')
0 files changed, 0 insertions, 0 deletions