diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-02 17:34:50 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-02 17:34:50 +0300 |
| commit | c17e2664371c1643135f8cfc245b8c1ed4f59f3d (patch) | |
| tree | b41651212156dfd684f8a54791bdf3b7cfc85c25 /EXCEPTIONS-CLIENT | |
| parent | 5a05c470eeede16c33586f95e0bf555c80bd81fb (diff) | |
| parent | c04e5bbe7069566b5842cc1f04687d5c964ab2ad (diff) | |
| download | mariadb-git-c17e2664371c1643135f8cfc245b8c1ed4f59f3d.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_base.cc
Diffstat (limited to 'EXCEPTIONS-CLIENT')
0 files changed, 0 insertions, 0 deletions