diff options
| author | unknown <hf@deer.(none)> | 2003-06-17 21:53:13 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-17 21:53:13 +0500 |
| commit | 46cb15ccd477007c8ba2abaa90f86960a8adc7bd (patch) | |
| tree | 8bec4511106588d39e833346b08272d3d00f72ee /include/mysql_com.h | |
| parent | ef726bbff367ab6c5aa735655d8ff6c3fdccdb7d (diff) | |
| parent | a4792eefad19e4f70471952afedef2221fbfbd64 (diff) | |
| download | mariadb-git-46cb15ccd477007c8ba2abaa90f86960a8adc7bd.tar.gz | |
SCRUM
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
include/mysql_com.h:
Auto merged
include/sql_common.h:
Auto merged
include/mysql.h:
conflicts merged
libmysql/client_settings.h:
conflicts merged
libmysql/libmysql.c:
conflicts merged
sql-common/client.c:
conflicts merged
sql/client_settings.h:
conflicts merged
sql/protocol.cc:
conflict merged
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 057045bd5a0..c480273f3e9 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -25,7 +25,7 @@ #define HOSTNAME_LENGTH 60 #define USERNAME_LENGTH 16 #define SERVER_VERSION_LENGTH 60 -#define SQLSTATE_LENGTH 6 +#define SQLSTATE_LENGTH 5 #define LOCAL_HOST "localhost" #define LOCAL_HOST_NAMEDPIPE "." @@ -110,6 +110,7 @@ enum enum_server_command #define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */ #define CLIENT_MULTI_QUERIES 65536 /* Enable/disable multiquery support */ #define CLIENT_MULTI_RESULTS 131072 /* Enable/disable multi-results */ +#define CLIENT_REMEMBER_OPTIONS (1L << 31) #define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */ #define SERVER_STATUS_AUTOCOMMIT 2 /* Server in auto_commit mode */ |