diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:35:25 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:35:25 +0300 |
| commit | 7e15d855f1fbc72bae6c0ee75dd2b61477c2eaff (patch) | |
| tree | 6cc5a2304ff1d8e8e5da08709d43daa27a50e91f /mysql-test/r/select_safe.result | |
| parent | f1e83a4163458f7e25c709403cc7c7b48a7ef23e (diff) | |
| parent | c5e6a11e149600b3c454043706170fad4e7c6ce4 (diff) | |
| download | mariadb-git-7e15d855f1fbc72bae6c0ee75dd2b61477c2eaff.tar.gz | |
Manual merge from mysql-5.1.
Conflicts:
- mysql-test/r/select.result
- mysql-test/t/select.test
- sql/item_cmpfunc.h
- sql/sql_show.cc
Diffstat (limited to 'mysql-test/r/select_safe.result')
0 files changed, 0 insertions, 0 deletions