diff options
| author | unknown <sanja@askmonty.org> | 2013-01-09 08:10:48 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-01-09 08:10:48 +0200 |
| commit | 655e30453135fd95c46ab02644e48e6813fc16f1 (patch) | |
| tree | d4717a012fe82e3cc07d7da79caac136b8d59aa5 /storage/cassandra | |
| parent | ffd5f8c8d4d48167852418cd1a1b17bdb2022e39 (diff) | |
| download | mariadb-git-655e30453135fd95c46ab02644e48e6813fc16f1.tar.gz | |
MDEV-4005 fix.
Field matching fixed.
DBUG_ASSERT fixed.
Diffstat (limited to 'storage/cassandra')
| -rw-r--r-- | storage/cassandra/ha_cassandra.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc index ad6fcf081fa..f2067969a5b 100644 --- a/storage/cassandra/ha_cassandra.cc +++ b/storage/cassandra/ha_cassandra.cc @@ -1517,6 +1517,7 @@ bool ha_cassandra::setup_field_converters(Field **field_arg, uint n_fields) DBUG_RETURN(true); } (*conv)->field= *field; + break; } } if (dyncol_set && !(*field)) // is needed and not found @@ -1611,7 +1612,7 @@ void ha_cassandra::free_field_converters() for (uint i=0; i < n_field_converters; i++) if (field_converters[i]) { - DBUG_ASSERT(!dyncol_set || i == dyncol_field); + DBUG_ASSERT(!dyncol_set || i != dyncol_field); delete field_converters[i]; } my_free(field_converters); |