summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2003-01-22 17:51:53 +0100
committerunknown <pem@mysql.com>2003-01-22 17:51:53 +0100
commit33c5a8afacfccd6960a7253d0bf997934b61733b (patch)
treeb03e692492b0111cf6d295b0d7622cbd0d6bd7c0 /sql/protocol.cc
parente4d956932e4ad01e729b325ce0b013833059a524 (diff)
downloadmariadb-git-33c5a8afacfccd6960a7253d0bf997934b61733b.tar.gz
Fixed bug in Protocol::convert_str() (missing return caused "Out of memory" errors
when optimized). sql/protocol.cc: Put inline back and added missing return.
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r--sql/protocol.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc
index adb925a8cd4..da9f5712e3a 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -40,9 +40,9 @@ bool Protocol::net_store_data(const char *from, uint length)
return 0;
}
-bool Protocol::convert_str(const char *from, uint length)
+inline bool Protocol::convert_str(const char *from, uint length)
{
- convert->store(packet, from, length);
+ return convert->store(packet, from, length);
}
#endif