diff options
| author | hf@deer.(none) <> | 2003-06-18 10:34:09 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-06-18 10:34:09 +0500 |
| commit | 66ecacb3c36f5fbe81f02b3594a3cc96a2afeea1 (patch) | |
| tree | c7c363a4269828e42d8b8818c5c01e520b608dd5 /sql/client_settings.h | |
| parent | b82e89d872402ceadb9c68ab85c4387f01e609cf (diff) | |
| download | mariadb-git-66ecacb3c36f5fbe81f02b3594a3cc96a2afeea1.tar.gz | |
Last part of resolving conflicts after pull
Some intersections with Monty encountered
Diffstat (limited to 'sql/client_settings.h')
| -rw-r--r-- | sql/client_settings.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h index 5a16fdd1c2f..b357e52ec9d 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -30,6 +30,5 @@ #define mysql_slave_send_query(A, B, C) 1 #define mysql_rpl_probe(mysql) 0 #undef HAVE_SMEM -#define CLI_MYSQL_USE_RESULT NULL #undef _CUSTOMCONFIG_ |