diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-27 22:55:51 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-27 22:55:51 +0300 |
| commit | be53d298e151ef48c65240a1b689d53a70f812d9 (patch) | |
| tree | d149efbd4d5e6fa1e680ea6852e68bdf88e7941a /mysql-test/extra | |
| parent | 992fc07377f1c0f2118ec9b78776ec002f2c6ed5 (diff) | |
| parent | d1d16f9c3f4310f3ab11fc85b47866d79243a471 (diff) | |
| download | mariadb-git-be53d298e151ef48c65240a1b689d53a70f812d9.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/sql_partition.cc
Diffstat (limited to 'mysql-test/extra')
0 files changed, 0 insertions, 0 deletions