Merge trunk changes

silvakid · silvakid · commit 46278b8ff751 · 2015-05-25T10:26:53.000+01:00
diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp
@@ -1286,6 +1286,8 @@ bool
 MySQL_Prepared_ResultSet::previous()
 {
 	CPP_ENTER("MySQL_Prepared_ResultSet::previous");
+
+	checkScrollable();
 	/* isBeforeFirst checks for validity */
 	if (isBeforeFirst()) {
 		return false;

Original file line number	Diff line number	Diff line change
`@@ -1286,6 +1286,8 @@ bool`
`1286`	`1286`	`MySQL_Prepared_ResultSet::previous()`
`1287`	`1287`	`{`
`1288`	`1288`	`CPP_ENTER("MySQL_Prepared_ResultSet::previous");`
	`1289`	`+`
	`1290`	`+ checkScrollable();`
`1289`	`1291`	`/* isBeforeFirst checks for validity */`
`1290`	`1292`	`if (isBeforeFirst()) {`
`1291`	`1293`	`return false;`