diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-06-07 12:47:04 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-06-07 12:47:04 +0400 |
| commit | 8a247e963dcaa12b70e9aae0c9f3cb831d30f4a7 (patch) | |
| tree | 4268070936d3c9dbd27165b1d9c1593e17ec0d61 /sql/sql_load.h | |
| parent | e4ab99764249f90a83c7f384eadc913331c59aee (diff) | |
| parent | 75dce25ca8276f56c45f747c9a9a1b4046b6efca (diff) | |
| download | mariadb-git-8a247e963dcaa12b70e9aae0c9f3cb831d30f4a7.tar.gz | |
Manual merge from mysql-trunk-bugfixing.
Conflicts:
- BUILD/SETUP.sh
- mysql-test/mysql-test-run.pl
- mysql-test/r/partition_error.result
- mysql-test/t/disabled.def
- mysql-test/t/partition_error.test
- sql/share/errmsg-utf8.txt
Diffstat (limited to 'sql/sql_load.h')
0 files changed, 0 insertions, 0 deletions