Merge remote-tracking branch 'origin/release/2.0.3' into release

rsomla1 · rsomla1 · commit 0b27333fc058 · 2016-09-30T16:57:21.000+02:00
diff --git a/xapi/result.cc b/xapi/result.cc
@@ -100,7 +100,8 @@ mysqlx_result_t::mysqlx_result_struct(mysqlx_stmt_t &parent, cdk::Reply &reply)
                                   m_row_proc(NULL),
                                   m_crud(parent),
                                   m_store_result(false),
-                                  m_filter_mask(0)
+                                  m_filter_mask(0),
+                                  m_current_id_index(0)
 {
   init_result(true);
 }
@@ -546,7 +547,7 @@ mysqlx_error_t * mysqlx_result_t::get_next_warning()
     if (m_warning_iter->next())
       m_current_warning.reset(new mysqlx_error_t(m_warning_iter->entry().get_error(), true));
     else
-      m_current_warning.release();
+      m_current_warning.reset(NULL);
 
     return m_current_warning.get();
   }

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ mysqlx_result_t::mysqlx_result_struct(mysqlx_stmt_t &parent, cdk::Reply &reply)`
`100`	`100`	`m_row_proc(NULL),`
`101`	`101`	`m_crud(parent),`
`102`	`102`	`m_store_result(false),`
`103`		`- m_filter_mask(0)`
	`103`	`+ m_filter_mask(0),`
	`104`	`+ m_current_id_index(0)`
`104`	`105`	`{`
`105`	`106`	`init_result(true);`
`106`	`107`	`}`
`@@ -546,7 +547,7 @@ mysqlx_error_t * mysqlx_result_t::get_next_warning()`
`546`	`547`	`if (m_warning_iter->next())`
`547`	`548`	`m_current_warning.reset(new mysqlx_error_t(m_warning_iter->entry().get_error(), true));`
`548`	`549`	`else`
`549`		`- m_current_warning.release();`
	`550`	`+ m_current_warning.reset(NULL);`
`550`	`551`
`551`	`552`	`return m_current_warning.get();`
`552`	`553`	`}`