Drizzle

Merge lp://qastaging/~stewart/drizzle/cleanups-1 into lp://qastaging/drizzle

  1. cleanups-1
  2. Merge into 7.2
Proposed by Stewart Smith
Status: Merged
Merged at revision: 2619
Proposed branch: lp://qastaging/~stewart/drizzle/cleanups-1
Merge into: lp://qastaging/drizzle
Diff against target: 243 lines (+15/-40)
14 files modified
client/drizzledump_drizzle.cc (+2/-2)
client/drizzledump_mysql.cc (+2/-2)
client/drizzletest.cc (+2/-2)
drizzled/internal/mf_format.cc (+1/-9)
drizzled/internal/my_sys.h (+0/-1)
drizzled/item/cmpfunc.h (+1/-4)
plugin/collation_dictionary/character_sets.cc (+1/-0)
plugin/collation_dictionary/collations.cc (+1/-0)
plugin/connection_id/connection_id.cc (+2/-2)
plugin/innobase/handler/ha_innodb.h (+1/-1)
plugin/json_server/sql_executor.cc (+1/-1)
plugin/myisam/ha_myisam.cc (+0/-14)
plugin/myisam/ha_myisam.h (+0/-1)
plugin/myisam/mi_open.cc (+1/-1)
To merge this branch: bzr merge lp://qastaging/~stewart/drizzle/cleanups-1
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+147553@code.qastaging.launchpad.net

Description of the change

First round of fixes from a coverity scan. Mostly pretty minor, and some dead code found.

To post a comment you must log in.
lp://qastaging/~stewart/drizzle/cleanups-1 updated
2627. By Stewart Smith

data_file_name and index_file_name in ha_myisam were actually all just dead code

2628. By Stewart Smith

Fix the following Coverity warning in class COND_EQUAL

CID 973373 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
2. uninit_member: Non-static class member "max_members" is not initialized in this constructor nor in any functions that it calls.

2629. By Stewart Smith

Fix Coverity found bug in drizzletest.cc:
CID 973171 (#1 of 1): Out-of-bounds access (OVERRUN)
2. alloc_strlen: Allocating insufficient memory for the terminating null of the string.

This isn't exploitable, just test suite.

2630. By Stewart Smith

Attempt to fix CID 980643 (#1 of 1): Uninitialized pointer read (UNINIT)
6. uninit_use: Using uninitialized value "index".

Basically, false positive but we could make the code a bit more obvious
that the first run through we were going to allocate index.

2631. By Stewart Smith

Attempt to fix CID 980642 (#1 of 1): Uninitialized pointer read (UNINIT)
6. uninit_use: Using uninitialized value "index".

Basically try and make the code a bit more obvious that we do in fact
alloc index on first run through.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: