Merged changes from 5.1-bugteam for bug#42503.

e1b299ed · Dmitry Shulga · 7cc60456 · f14d8c28 · e1b299ed
Commit e1b299ed authored Sep 24, 2010 by Dmitry Shulga
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/sql_cache.cc sql/sql_cache.cc +2 -0

No files found.
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1346,6 +1346,7 @@ end:
 }


+#ifndef EMBEDDED_LIBRARY
 /**
  Send a single memory block from the query cache.

@@ -1393,6 +1394,7 @@ send_data_in_chunks(NET *net, const uchar *packet, ulong len)

  return FALSE;
 }
+#endif


 /*