Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik 2016-03-21 13:02:53 +01:00
commit 3b0c7ac1f9
142 changed files with 383 additions and 286 deletions

View file

@ -2016,7 +2016,7 @@ void ha_federated::start_bulk_insert(ha_rows rows, uint flags)
@return Operation status
@retval 0 No error
@retval != 0 Error occured at remote server. Also sets my_errno.
@retval != 0 Error occurred at remote server. Also sets my_errno.
*/
int ha_federated::end_bulk_insert()