diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 23:15:57 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 23:15:57 +0300 |
| commit | 69cb0a8035c495dd1208f14f13d786745602a062 (patch) | |
| tree | 41e4e023b83ebd82ab39f5c6e161a20f7fc4df61 /mysql-test/r/have_ndbapi_examples.require | |
| parent | 7bb5169d5ed22b73e20b3ee17f9bf14ec1e938d2 (diff) | |
| parent | 4cfda7fd3b3fe10acb55eb9fbf0a5743defaab3b (diff) | |
| download | mariadb-git-69cb0a8035c495dd1208f14f13d786745602a062.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/sql_select.cc
Diffstat (limited to 'mysql-test/r/have_ndbapi_examples.require')
0 files changed, 0 insertions, 0 deletions