1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge branch '10.0' into 10.1

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

View File

@@ -8563,7 +8563,7 @@ bool setup_on_expr(THD *thd, TABLE_LIST *table, bool is_update)
TODO
RETURN
TRUE if some error occured (e.g. out of memory)
TRUE if some error occurred (e.g. out of memory)
FALSE if all is OK
*/
@@ -8673,7 +8673,7 @@ err_no_arena:
function.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/
@@ -8835,7 +8835,7 @@ static bool not_null_fields_have_null_values(TABLE *table)
record[1] buffers correspond to new and old versions of row respectively.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/
@@ -8895,7 +8895,7 @@ fill_record_n_invoke_before_triggers(THD *thd, TABLE *table, List<Item> &fields,
function.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/
@@ -8990,7 +8990,7 @@ err:
record[1] buffers correspond to new and old versions of row respectively.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/