diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-05 16:39:03 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-05 16:39:03 -0300 |
| commit | 60a9d9bbb94ac03159bcc2d75b649abb1c9dc956 (patch) | |
| tree | 1fb25244a6b004ddafb31844314b374fe38adf33 /plugin | |
| parent | a8c288054efb4de42cefa5bf06bcb487171ed9d3 (diff) | |
| download | mariadb-git-60a9d9bbb94ac03159bcc2d75b649abb1c9dc956.tar.gz | |
Post-merge fix: header is used by the client API. Obvious in retrospect.
Also, update a few cases missed by the initial patch.
client/mysqltest.cc:
Remove trailing comma.
include/my_alloc.h:
Do not use wrapper.
include/mysql.h.pp:
Update ABI file.
plugin/semisync/semisync_master.h:
Initialize variable.
sql/debug_sync.cc:
Use C linkage.
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/semisync/semisync_master.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/semisync/semisync_master.h b/plugin/semisync/semisync_master.h index e1ad28cd9f6..1a562e8bb77 100644 --- a/plugin/semisync/semisync_master.h +++ b/plugin/semisync/semisync_master.h @@ -153,7 +153,7 @@ public: int free_nodes_before(TranxNode* node) { Block *block; - Block *prev_block; + Block *prev_block= NULL; block= first_block; while (block != current_block->next) |