diff options
| author | unknown <jani/jamppa@production.mysql.com> | 2006-09-25 08:10:58 +0200 |
|---|---|---|
| committer | unknown <jani/jamppa@production.mysql.com> | 2006-09-25 08:10:58 +0200 |
| commit | af3f646c2972e07deba3390efa4ed6ca5a239f9f (patch) | |
| tree | 03966d95a898f33cb199516a8bbdf0e50ed228b8 /include | |
| parent | 224e0b5f588e1c4ab51f528e570846e0c16a43ff (diff) | |
| parent | 6db41716915cdf45d92a023c17343c9554f61d47 (diff) | |
| download | mariadb-git-af3f646c2972e07deba3390efa4ed6ca5a239f9f.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index d0bf1b1fec0..af3b8535ee2 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -182,7 +182,7 @@ typedef struct st_vio Vio; #define MAX_INT_WIDTH 10 /* Max width for a LONG w.o. sign */ #define MAX_BIGINT_WIDTH 20 /* Max width for a LONGLONG */ #define MAX_CHAR_WIDTH 255 /* Max length for a CHAR colum */ -#define MAX_BLOB_WIDTH 8192 /* Default width for blob */ +#define MAX_BLOB_WIDTH 16777216 /* Default width for blob */ typedef struct st_net { #if !defined(CHECK_EMBEDDED_DIFFERENCES) || !defined(EMBEDDED_LIBRARY) |