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/sql_common.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/sql_common.h')
| -rw-r--r-- | include/sql_common.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/sql_common.h b/include/sql_common.h index 11f432fb478..cd1d2331d96 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -41,9 +41,5 @@ void mysql_read_default_options(struct st_mysql_options *options, } #endif -#ifdef MYSQL_SERVER -#define protocol_41(A) FALSE -#else #define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41) -#endif |