diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-06-18 14:39:21 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-06-18 14:39:21 +0200 |
| commit | 2a663359a4a1c7fda3b67d92dfcea19fa9c76410 (patch) | |
| tree | 76bd6e564ab54814aafd55b530419efb8d107305 /storage/xtradb/include/pars0pars.h | |
| parent | f835970430402dcc9a587912fe75fad7c352b9ac (diff) | |
| download | mariadb-git-2a663359a4a1c7fda3b67d92dfcea19fa9c76410.tar.gz | |
Fix test cases after merge of XtraDB into MariaDB.
Manually merge some InnoDB changes into XtraDB.
Fix ALTER TABLE bug in XtraDB with wrong comparison of row type.
mysql-test/include/varchar.inc:
Fix in test case that which of several duplicate keys triggers an error is not
deterministic.
mysql-test/mysql-test-run.pl:
InnoDB does not bother to free resources individually during shutdown, but due to using
its own memory tracking it nevertheless can free everything at exit. But XtraDB adds an
option, on by default, to skip this extra tracking. This causes lots of Valgrind
warnings, so needs to be disabled for Valgrind testing.
mysql-test/r/innodb.result:
Fix in test case that which of several duplicate keys triggers an error is not
deterministic.
mysql-test/t/innodb-use-sys-malloc.test:
InnoDB does not bother to free resources individually during shutdown, but due to using
its own memory tracking it nevertheless can free everything at exit. But XtraDB adds an
option, on by default, to skip this extra tracking. This causes lots of Valgrind
warnings, so needs to be disabled for Valgrind testing.
sql/sql_table.cc:
Add some useful DBUG while debugging alter table.
storage/xtradb/handler/ha_innodb.cc:
Fix that check_if_incompatible_data did not realise that ROW_TYPE_DEFAULT is identical
to the default row format ROW_TYPE_COMPACT, causing excessive table copying in
ALTER TABLE
Add some useful DBUG while debugging alter table.
Manually merge into XtraDB a few small changes for InnoDB from upstream MySQL.
storage/xtradb/include/pars0pars.h:
Manually merge into XtraDB a few small changes for InnoDB from upstream MySQL.
storage/xtradb/include/univ.i:
Manually merge a MariaDB fix in InnoDB into XtraDB.
Diffstat (limited to 'storage/xtradb/include/pars0pars.h')
| -rw-r--r-- | storage/xtradb/include/pars0pars.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/include/pars0pars.h b/storage/xtradb/include/pars0pars.h index e5693ee5575..865f24f7bf4 100644 --- a/storage/xtradb/include/pars0pars.h +++ b/storage/xtradb/include/pars0pars.h @@ -700,7 +700,7 @@ struct for_node_struct{ definition */ que_node_t* loop_start_limit;/* initial value of loop variable */ que_node_t* loop_end_limit; /* end value of loop variable */ - int loop_end_value; /* evaluated value for the end value: + lint loop_end_value; /* evaluated value for the end value: it is calculated only when the loop is entered, and will not change within the loop */ |