summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--000_index.txt6
-rw-r--r--718_all_mysqlclient_perfomance_fix_mybug_33057.patch40
2 files changed, 0 insertions, 46 deletions
diff --git a/000_index.txt b/000_index.txt
index 3f39e3c..29d2f86 100644
--- a/000_index.txt
+++ b/000_index.txt
@@ -422,12 +422,6 @@
@pn mysql-slotted
@@ s390x needs a sane stack size
-@patch 718_all_mysqlclient_perfomance_fix_mybug_33057.patch
-@ver 5.00.51.00 to 5.00.55.99
-@pn mysql
-@pn mysql-community
-@@ Fix performance of regression of mysql client when loading large dumps (upstream bug 33057)
-
@patch 719_all_disallow_database_ops_without_super_mybug_27440.patch
@ver 5.00.51.00 to 5.00.55.99
@ver 5.01.21.00 to 5.01.22.99
diff --git a/718_all_mysqlclient_perfomance_fix_mybug_33057.patch b/718_all_mysqlclient_perfomance_fix_mybug_33057.patch
deleted file mode 100644
index 8858f65..0000000
--- a/718_all_mysqlclient_perfomance_fix_mybug_33057.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://lists.mysql.com/commits/40304?f=plain
-
-From: Daniel FischerDate: December 20 2007 9:37pm
-Subject: bk commit into 5.0 tree (df:1.2584) BUG#33057
-
-Below is the list of changes that have just been committed into a local
-5.0 repository of df. When df does a push these changes
-will be propagated to the main repository and, within 24 hours after the
-push, to the public repository.
-For information on how to access the public repository
-see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
-
-ChangeSet@stripped, 2007-12-20 21:37:21+01:00, df@stripped +1 -0
- BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump
-
- client/mysql.cc@stripped, 2007-12-20 21:37:19+01:00, df@stripped +1 -3
- BUG#33057, avoid calling strlen() *for every single character* in the client's input
-
-diff -Nrup a/client/mysql.cc b/client/mysql.cc
---- a/client/mysql.cc 2007-12-13 11:49:10 +01:00
-+++ b/client/mysql.cc 2007-12-20 21:37:19 +01:00
-@@ -1272,9 +1272,7 @@ static bool add_line(String &buffer,char
- if (status.add_to_history && line[0] && not_in_history(line))
- add_history(line);
- #endif
--#ifdef USE_MB
- char *end_of_line=line+(uint) strlen(line);
--#endif
-
- for (pos=out=line ; (inchar= (uchar) *pos) ; pos++)
- {
-@@ -1364,7 +1362,7 @@ static bool add_line(String &buffer,char
- }
- }
- else if (!*ml_comment && !*in_string &&
-- strlen(pos) >= 10 &&
-+ (end_of_line - pos) >= 10 &&
- !my_strnncoll(charset_info, (uchar*) pos, 10,
- (const uchar*) "delimiter ", 10))
- {