diff options
author | unknown <magnus@neptunus.(none)> | 2004-05-25 12:25:22 +0200 |
---|---|---|
committer | unknown <magnus@neptunus.(none)> | 2004-05-25 12:25:22 +0200 |
commit | 4cb7f4944d48d69e13138e196d3d5f55eb6a94df (patch) | |
tree | 53c45c9394c46d7f605d226266e85ee4fd30776f /include/mysql_com.h | |
parent | c94b1d606f15a2546f6cb05ea31797d306b09183 (diff) | |
parent | f80e9e042ee33e1debdac1e46992470e495921c9 (diff) | |
download | mariadb-git-4cb7f4944d48d69e13138e196d3d5f55eb6a94df.tar.gz |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'include/mysql_com.h')
-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 ada2bd1f679..a1da896af38 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -359,6 +359,6 @@ char *net_store_length(char *pkg, ulonglong length); #define NULL_LENGTH ((unsigned long) ~0) /* For net_store_length */ #define MYSQL_STMT_HEADER 4 -#define MYSQL_LONG_DATA_HEADER 6 +#define MYSQL_LONG_DATA_HEADER 6 #endif |