diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-22 09:31:24 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-22 09:31:24 +0300 |
| commit | f23b17696c0d6cef589c5b7bed12911609700ac4 (patch) | |
| tree | 54f1c9bcd072587e1860fe234c3264734b3b8dc5 /mysql-test/t/timezone_grant.test | |
| parent | cb2c2fd8df18ad10792a1ccd20ac63d526786c54 (diff) | |
| parent | 9ce5872e038157e2a241d1b0726cbf56496fa5e1 (diff) | |
| download | mariadb-git-f23b17696c0d6cef589c5b7bed12911609700ac4.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- storage/ibmdb2i/ha_ibmdb2i.cc
Diffstat (limited to 'mysql-test/t/timezone_grant.test')
0 files changed, 0 insertions, 0 deletions