diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-18 23:19:19 +0300 |
| commit | 40271e4f5edacc6fe90ed74a087e5ff25daea899 (patch) | |
| tree | d38210df12297fa40d9edbf59cbb72329a4ccad4 /extra | |
| parent | 0ae23cd69d3c13dba2a73750e93abf3342f21eb4 (diff) | |
| parent | 33c075e842324cfdf0aab055c2db8d0d50bcbc68 (diff) | |
| download | mariadb-git-40271e4f5edacc6fe90ed74a087e5ff25daea899.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_plugin.cc
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions