database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-03-23 22:36:46 +01:00
parent a75d269464 2783fc7d14
commit f67a2211ec
298 changed files with 4436 additions and 1473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_base.cc
View File

@@ -8557,7 +8557,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
*/
@@ -8667,7 +8667,7 @@ err_no_arena:
function.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/
@@ -8829,7 +8829,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.
*/
@@ -8889,7 +8889,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.
*/
@@ -8984,7 +8984,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.
*/