diff options
| author | unknown <monty@mysql.com> | 2004-06-25 21:56:23 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-25 21:56:23 +0300 |
| commit | ba8ffc50a96897f85f32c01485d44730b9deb383 (patch) | |
| tree | 06dc93aec118ef2da622d0ade5ab9cf7f4664b88 /sql-common | |
| parent | c6e23c85493688417c0274b4630a6b7c44f59d10 (diff) | |
| download | mariadb-git-ba8ffc50a96897f85f32c01485d44730b9deb383.tar.gz | |
After merge fixes
include/mysql.h:
Cleanup
sql-common/client.c:
Allow client.c to compile after changes to mysql.h
sql/opt_range.cc:
Make bdb.test repeatable (and assume that table scans is a little bit slower)
sql/sql_handler.cc:
Fixed typo during merge
sql/sql_insert.cc:
Fixed indentation
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 5c1a718c5bb..e6c36965f97 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -39,6 +39,10 @@ #include "mysql.h" +/* Remove client convenience wrappers */ +#undef max_allowed_packet +#undef net_buffer_length + #ifdef EMBEDDED_LIBRARY #undef MYSQL_SERVER |