diff options
author | unknown <monty@mysql.com> | 2005-06-05 17:19:50 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2005-06-05 17:19:50 +0300 |
commit | 4eb26350cbba8a636427d875304e9bfe0caac632 (patch) | |
tree | e71cd25539c70e1d293ee75eda9bbe9defa7ff74 /libmysql | |
parent | dab1b26b1d3ec57e11681459282de2fe81e362f3 (diff) | |
parent | b08b3a1555c296e4e396fd968a268b7b3dd58397 (diff) | |
download | mariadb-git-4eb26350cbba8a636427d875304e9bfe0caac632.tar.gz |
merge
client/mysql.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_bitmap.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index d294921aad2..753657951ee 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1738,7 +1738,7 @@ myodbc_remove_escape(MYSQL *mysql,char *name) /* Default number of rows fetched per one COM_FETCH command. */ -#define DEFAULT_PREFETCH_ROWS 1UL +#define DEFAULT_PREFETCH_ROWS (ulong) 1 /* These functions are called by function pointer MYSQL_STMT::read_row_func. |