Merge mysql.com:/home/jimw/my/mysql-5.0-10214

into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
tests/mysql_client_test.c:
  Clean up merge of new tests

1 files changed, 8 insertions, 1 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index e33fd470582..2a4bc5151c1 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1616,7 +1616,14 @@ ulong STDCALL
 mysql_real_escape_string(MYSQL *mysql, char *to,const char *from,
 			 ulong length)
 {
-  return escape_string_for_mysql(mysql->charset, to, 0, from, length);
+  if (mysql->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)
+  {
+    return escape_quotes_for_mysql(mysql->charset, to, 0, from, length);
+  }
+  else
+  {
+    return escape_string_for_mysql(mysql->charset, to, 0, from, length);
+  }
 }