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

rsomla1 · rsomla1 · commit 2917dba2a3b5 · 2016-09-30T17:49:12.000+02:00
diff --git a/devapi/result.cc b/devapi/result.cc
@@ -1387,13 +1387,17 @@ internal::BaseResult::getWarnings()
 
 uint64_t Result::getAffectedItemsCount() const
 {
-  return get_impl().get_affected_rows();
+  try {
+    return get_impl().get_affected_rows();
+  } CATCH_AND_WRAP
 }
 
 
 uint64_t Result::getAutoIncrementValue() const
 {
-  return get_impl().get_auto_increment();
+  try {
+    return get_impl().get_auto_increment();
+  } CATCH_AND_WRAP
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1387,13 +1387,17 @@ internal::BaseResult::getWarnings()`
`1387`	`1387`
`1388`	`1388`	`uint64_t Result::getAffectedItemsCount() const`
`1389`	`1389`	`{`
`1390`		`- return get_impl().get_affected_rows();`
	`1390`	`+ try {`
	`1391`	`+ return get_impl().get_affected_rows();`
	`1392`	`+ } CATCH_AND_WRAP`
`1391`	`1393`	`}`
`1392`	`1394`
`1393`	`1395`
`1394`	`1396`	`uint64_t Result::getAutoIncrementValue() const`
`1395`	`1397`	`{`
`1396`		`- return get_impl().get_auto_increment();`
	`1398`	`+ try {`
	`1399`	`+ return get_impl().get_auto_increment();`
	`1400`	`+ } CATCH_AND_WRAP`
`1397`	`1401`	`}`
`1398`	`1402`
`1399`	`1403`