Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge


sql/ha_federated.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
mysql-test/r/auto_increment.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/create.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/federated.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/insert.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/insert_select.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/key.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/null.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/null_key.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_2myisam.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_3innodb.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_4heap.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_5merge.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_6bdb.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/ps_7ndb.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/strict.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/view.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/r/warnings.result:
  merge of 5.1-engines and 5.0-engines, hand merge
mysql-test/t/federated.test:
  merge of 5.1-engines and 5.0-engines, hand merge
sql/ha_federated.h:
  merge of 5.1-engines and 5.0-engines, hand merge
storage/csv/ha_tina.cc:
  merge of 5.1-engines and 5.0-engines, hand merge

1 files changed, 1 insertions, 1 deletions

diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 1b5098a7519..c806dd410f3 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -180,7 +180,7 @@ static int tina_done_func()
   }
   return 0;
 }
-	
+
 
 /*
   Simple lock controls.