diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:12:07 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:12:07 +0300 |
| commit | fbede822d6a1b4810e6b9e50b8170492a8ca085e (patch) | |
| tree | a72ad839d2e6423a5e8af96908e8715517d83714 /mysql-test/suite/sys_vars/t/sql_mode_basic.test | |
| parent | a59a93a291657c005ffa4d9a11189975453d8110 (diff) | |
| parent | d0ea2cadc254f77fb29d7ef3720094393722f25e (diff) | |
| download | mariadb-git-fbede822d6a1b4810e6b9e50b8170492a8ca085e.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- storage/myisam/mi_static.c
Diffstat (limited to 'mysql-test/suite/sys_vars/t/sql_mode_basic.test')
0 files changed, 0 insertions, 0 deletions