Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/opt/local/work/mysql-5.0-9643

2 files changed, 9 insertions, 2 deletions

diff --git a/include/errmsg.h b/include/errmsg.h
index fd3da392df4..1dd5759c104 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -96,6 +96,7 @@ extern const char *client_errors[];	/* Error messages */
 #define CR_NO_DATA                              2051
 #define CR_NO_STMT_METADATA                     2052
 #define CR_NO_RESULT_SET                        2053
-#define CR_ERROR_LAST  /*Copy last error nr:*/  2053
+#define CR_NOT_IMPLEMENTED                      2054
+#define CR_ERROR_LAST  /*Copy last error nr:*/  2054
 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
 
diff --git a/include/mysql.h b/include/mysql.h
index bcff8fa8645..b2b2e239758 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -664,6 +664,7 @@ typedef struct st_mysql_stmt
                                   unsigned char **row);
   unsigned long	 stmt_id;	       /* Id for prepared statement */
   unsigned long  flags;                /* i.e. type of cursor to open */
+  unsigned long  prefetch_rows;        /* number of rows per one COM_FETCH */
   /*
     Copied from mysql->server_status after execute/fetch to know
     server-side cursor status for this statement.
@@ -702,7 +703,12 @@ enum enum_stmt_attr_type
     unsigned long with combination of cursor flags (read only, for update,
     etc)
   */
-  STMT_ATTR_CURSOR_TYPE
+  STMT_ATTR_CURSOR_TYPE,
+  /*
+    Amount of rows to retrieve from server per one fetch if using cursors.
+    Accepts unsigned long attribute in the range 1 - ulong_max
+  */
+  STMT_ATTR_PREFETCH_ROWS
 };