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 | d3755291caa9c93f7aca42c09db9aeb1df0ef84f (patch) | |
| tree | b41651212156dfd684f8a54791bdf3b7cfc85c25 /mysql-test/include/have_gb2312.inc | |
| parent | b184d466acee921247541fd0a42eb62d23b07dec (diff) | |
| parent | 64b91b2698603d24e8ffde46fc9421a6d2442a35 (diff) | |
| download | mariadb-git-d3755291caa9c93f7aca42c09db9aeb1df0ef84f.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_base.cc
Diffstat (limited to 'mysql-test/include/have_gb2312.inc')
0 files changed, 0 insertions, 0 deletions