bk commit into 5.1 tree (kostja:1.2468) BUG#26765

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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-03-15 23:17:44+03:00, kostja@stripped +3 -0
  Bug#26765 "typo when running mysql-test-run"
  Fix a typo (togheter -> together)

  mysql-test/mysql-test-run.pl@stripped, 2007-03-15 23:17:39+03:00, kostja@stripped +1 -1
    Fix a typo (togheter -> together)

  storage/ndb/test/include/NDBT_Error.hpp@stripped, 2007-03-15 23:17:39+03:00,
kostja@stripped +2 -2
    Fix a typo (togheter -> together)

  storage/ndb/test/include/NDBT_ReturnCodes.h@stripped, 2007-03-15 23:17:39+03:00,
kostja@stripped +1 -1
    Fix a typo (togheter -> together)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime

--- 1.275/mysql-test/mysql-test-run.pl	2007-03-06 18:55:01 +03:00
+++ 1.276/mysql-test/mysql-test-run.pl	2007-03-15 23:17:39 +03:00
@@ -899,7 +899,7 @@
   # --------------------------------------------------------------------------
   if ( $opt_with_ndbcluster and !$opt_bench)
   {
-    mtr_error("Can only use --with-ndbcluster togheter with --bench");
+    mtr_error("Can only use --with-ndbcluster together with --bench");
   }
 
   if ( $opt_ndbconnectstring )

--- 1.4/storage/ndb/test/include/NDBT_Error.hpp	2006-12-23 22:20:24 +03:00
+++ 1.5/storage/ndb/test/include/NDBT_Error.hpp	2007-03-15 23:17:39 +03:00
@@ -77,8 +77,8 @@
 };
 
 //
-//  ERR prints an NdbError object togheter with a description of where 
-//  the error occured
+//  ERR prints an NdbError object together with a description of where the
+//  error occured
 //
 #define ERR_OUT(where, error) \
   {  where << "ERROR: " << error.code << " " \

--- 1.3/storage/ndb/test/include/NDBT_ReturnCodes.h	2006-12-23 22:20:24 +03:00
+++ 1.4/storage/ndb/test/include/NDBT_ReturnCodes.h	2007-03-15 23:17:39 +03:00
@@ -26,7 +26,7 @@
 #define NDBT_TEMPORARY 3
 /**
  * NDBT_ProgramExit
- * This function will print the returncode togheter with a prefix on 
+ * This function will print the returncode together with a prefix on 
  * the screen and then exit the test program. 
  * Call this function when exiting the main function in your test programs
  * Returns the return code