diff options
author | unknown <monty@mysql.com> | 2004-05-27 02:50:42 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-05-27 02:50:42 +0300 |
commit | abd68407bf756cee304fda6d84b1e81716910fc3 (patch) | |
tree | e8f0280e6d5400b10d0c17c98f09e48a7f824dd1 /libmysqld/lib_sql.cc | |
parent | 1d7d760958ad9e98ca0173730f9b8b82e55dc6b6 (diff) | |
download | mariadb-git-abd68407bf756cee304fda6d84b1e81716910fc3.tar.gz |
After merge fixes
Docs/manual_toc.html:
Rename: BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41 -> Docs/manual_toc.html
libmysqld/lib_sql.cc:
Fixed type of new variables
libmysqld/libmysqld.c:
Removed duplicate function (allready in libmysql.c)
Diffstat (limited to 'libmysqld/lib_sql.cc')
-rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 26609e748a7..2ceeb43a91e 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -25,7 +25,7 @@ extern "C" { - unsigned long max_allowed_packet, net_buffer_length; + extern unsigned long max_allowed_packet, net_buffer_length; } static int fake_argc= 1; |