diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-28 15:08:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-28 15:08:12 +0100 |
| commit | e79847d16a0f51137ca46f23af7d5276dce7952d (patch) | |
| tree | be71c60badd9dc5a88b07f968688024c1f09a348 /storage | |
| parent | a293d0788c2425ef702f02b4cce41ed1cf56055f (diff) | |
| download | mariadb-git-e79847d16a0f51137ca46f23af7d5276dce7952d.tar.gz | |
after merge fixes
sql/sql_base.cc:
fix a memory leak
storage/xtradb/handler/ha_innodb.cc:
fix for a visual studio
storage/xtradb/row/row0ins.c:
valgrind complains about uninitialized variable.
incorrect errors in the innodb.test too
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 9 | ||||
| -rw-r--r-- | storage/xtradb/row/row0ins.c | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 66243ad2e34..beb45305ba3 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -11614,14 +11614,13 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter, "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket", NULL, NULL, 500L, 1L, ~0L, 0); -static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, - PLUGIN_VAR_RQCMDARG, #ifdef EXTENDED_FOR_KILLIDLE - "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB.", +#define kill_idle_help_text "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB." #else - "No effect for this build.", +#define kill_idle_help_text "No effect for this build." #endif - NULL, NULL, 0, 0, LONG_MAX, 0); +static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, + PLUGIN_VAR_RQCMDARG, kill_idle_help_text, NULL, NULL, 0, 0, LONG_MAX, 0); static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR, diff --git a/storage/xtradb/row/row0ins.c b/storage/xtradb/row/row0ins.c index 0e62185c02e..6068c3547df 100644 --- a/storage/xtradb/row/row0ins.c +++ b/storage/xtradb/row/row0ins.c @@ -493,7 +493,8 @@ row_ins_cascade_calc_update_vec( ufield->field_no = dict_table_get_nth_col_pos( table, dict_col_get_no(col)); - ufield->exp = NULL; + + ufield->orig_len = 0; ufield->new_val = parent_ufield->new_val; ufield_len = dfield_get_len(&ufield->new_val); |