diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-06 02:04:52 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-06 02:04:52 +0200 |
| commit | fb74fccff9e46cc6392fae262491d4b4218f4e5e (patch) | |
| tree | f66f929cc02cd3b110667183929f39e5bd2231a9 /include | |
| parent | 14810ff1d3e7d74167f59c6c4baf1f11491810f7 (diff) | |
| parent | e3c7f4d85ec4caf59fc408cf5643e5dc64e9a3d4 (diff) | |
| download | mariadb-git-fb74fccff9e46cc6392fae262491d4b4218f4e5e.tar.gz | |
Merge with 4.0.8
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
acinclude.m4:
Auto merged
include/mysql.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test1.c:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/table.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 1 | ||||
| -rw-r--r-- | include/mysql_com.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index a2b48c0c43d..e43136f8f69 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -127,6 +127,7 @@ struct st_mysql_options { char *ssl_ca; /* PEM CA file */ char *ssl_capath; /* PEM directory of CA-s? */ char *ssl_cipher; /* cipher to use */ + unsigned long max_allowed_packet; my_bool use_ssl; /* if to use SSL or not */ my_bool compress,named_pipe; /* diff --git a/include/mysql_com.h b/include/mysql_com.h index d4d0b63dc78..8716ef3a58f 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -42,7 +42,8 @@ enum enum_server_command COM_PROCESS_INFO, COM_CONNECT, COM_PROCESS_KILL, COM_DEBUG, COM_PING, COM_TIME, COM_DELAYED_INSERT, COM_CHANGE_USER, COM_BINLOG_DUMP, COM_TABLE_DUMP, COM_CONNECT_OUT, COM_REGISTER_SLAVE, - COM_PREPARE, COM_EXECUTE, COM_LONG_DATA, COM_CLOSE_STMT + COM_PREPARE, COM_EXECUTE, COM_LONG_DATA, COM_CLOSE_STMT, + COM_END /* Must be last */ }; |