bk commit into 6.0 tree (anozdrin:1.2575)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
6.0 repository of anozdrin.  When anozdrin 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, 2008-02-26 23:18:13+03:00, anozdrin@quad. +4 -0
  Fix auto merge; disable failing tests (Bug 34858).

  mysql-test/t/disabled.def@stripped, 2008-02-26 23:18:11+03:00, anozdrin@quad. +6 -0
    Disable failing tests (Bug 34858)

  sql/backup/backup_progress.cc@stripped, 2008-02-26 23:18:12+03:00, anozdrin@quad. +1 -1
    Fix auto merge.

  sql/backup/backup_test.cc@stripped, 2008-02-26 23:18:12+03:00, anozdrin@quad. +1 -1
    Fix auto merge.

  sql/backup/kernel.cc@stripped, 2008-02-26 23:18:12+03:00, anozdrin@quad. +1 -1
    Fix auto merge.

diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-02-26 19:57:11 +03:00
+++ b/mysql-test/t/disabled.def	2008-02-26 23:18:11 +03:00
@@ -34,3 +34,9 @@ backup_security       :BUG#34235 pending
 backup_snapshot       :BUG#34235 pending replacement of test facility with WL#4259
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
 ctype_latin2_ch      : BUG #33791 2008-01-18 mats Wrong ORDER BY with latin2_czech_cs
+
+backup_errors        : Bug#34858 2008-Feb-28 Server crashes by backup tests
+backup_fkey          : Bug#34858 2008-Feb-28 Server crashes by backup tests
+backup_no_data       : Bug#34858 2008-Feb-28 Server crashes by backup tests
+backup_no_engine     : Bug#34858 2008-Feb-28 Server crashes by backup tests
+backup_objects       : Bug#34858 2008-Feb-28 Server crashes by backup tests
diff -Nrup a/sql/backup/backup_progress.cc b/sql/backup/backup_progress.cc
--- a/sql/backup/backup_progress.cc	2008-02-15 23:44:59 +03:00
+++ b/sql/backup/backup_progress.cc	2008-02-26 23:18:12 +03:00
@@ -997,7 +997,7 @@ int print_backup_summary(THD *thd, ulong
   protocol->store(buf, system_charset_info);
   protocol->write();
 
-  send_eof(thd);
+  my_eof(thd);
   DBUG_RETURN(ret);
 }
 
diff -Nrup a/sql/backup/backup_test.cc b/sql/backup/backup_test.cc
--- a/sql/backup/backup_test.cc	2008-01-15 02:44:12 +03:00
+++ b/sql/backup/backup_test.cc	2008-02-26 23:18:12 +03:00
@@ -236,7 +236,7 @@ int execute_backup_test_command(THD *thd
 
   delete it;
 
-  send_eof(thd);
+  my_eof(thd);
 //  delete i;
   DBUG_RETURN(res);
 }
diff -Nrup a/sql/backup/kernel.cc b/sql/backup/kernel.cc
--- a/sql/backup/kernel.cc	2008-02-15 18:57:49 +03:00
+++ b/sql/backup/kernel.cc	2008-02-26 23:18:12 +03:00
@@ -1867,7 +1867,7 @@ bool send_summary(THD *thd, const Image_
   protocol->store(buf, system_charset_info);
   protocol->write();
 
-  send_eof(thd);
+  my_eof(thd);
   DBUG_RETURN(ret);
 }