Commit 47a82ad5 authored by Sergei Golubchik's avatar Sergei Golubchik

Bug#38135 Assertion failed: save_errno, file .\ma_update.c, line 200

typo fixed.

mysql-test/r/maria.result:
  new test case
mysql-test/t/maria.test:
  new test case
sql/sql_select.cc:
  ctags friendly
storage/maria/ma_blockrec.c:
  typo fixed
parent 9e762653
This diff is collapsed.
This diff is collapsed.
...@@ -125,8 +125,7 @@ static COND *optimize_cond(JOIN *join, COND *conds, ...@@ -125,8 +125,7 @@ static COND *optimize_cond(JOIN *join, COND *conds,
Item::cond_result *cond_value); Item::cond_result *cond_value);
static bool const_expression_in_where(COND *conds,Item *item, Item **comp_item); static bool const_expression_in_where(COND *conds,Item *item, Item **comp_item);
static bool open_tmp_table(TABLE *table); static bool open_tmp_table(TABLE *table);
static bool create_internal_tmp_table(TABLE *table,TMP_TABLE_PARAM *param, static bool create_internal_tmp_table(TABLE *,TMP_TABLE_PARAM *, ulonglong);
ulonglong options);
static bool create_internal_tmp_table_from_heap2(THD *thd, TABLE *table, static bool create_internal_tmp_table_from_heap2(THD *thd, TABLE *table,
TMP_TABLE_PARAM *param, TMP_TABLE_PARAM *param,
int error, int error,
......
...@@ -3073,7 +3073,7 @@ static my_bool write_block_record(MARIA_HA *info, ...@@ -3073,7 +3073,7 @@ static my_bool write_block_record(MARIA_HA *info,
} }
else else
{ {
if (my_multi_malloc(MY_WME, &log_array, if (!my_multi_malloc(MY_WME, &log_array,
(uint) ((bitmap_blocks->count + (uint) ((bitmap_blocks->count +
TRANSLOG_INTERNAL_PARTS + 2) * TRANSLOG_INTERNAL_PARTS + 2) *
sizeof(*log_array)), sizeof(*log_array)),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment