bk commit into 5.1 tree (mronstrom:1.2002)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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
  1.2002 05/09/13 14:25:14 mronstrom@stripped +14 -0
  Merge mronstrom@stripped:/home/bk/mysql-5.1
  into  mysql.com:/Users/mikron/wl2498

  sql/sql_show.cc
    1.264 05/09/13 14:24:59 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/test/src/UtilTransactions.cpp
    1.26 05/09/13 14:25:01 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/test/src/NDBT_Test.cpp
    1.29 05/09/13 14:25:01 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/test/ndbapi/bank/Bank.hpp
    1.10 05/09/13 14:25:01 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/test/ndbapi/bank/Bank.cpp
    1.13 05/09/13 14:25:01 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/test/ndbapi/Makefile.am
    1.25 05/09/13 14:25:01 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/test/include/NDBT_Test.hpp
    1.17 05/09/13 14:25:01 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/src/mgmapi/mgmapi.cpp
    1.54 05/09/13 14:25:01 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.100 05/09/13 14:25:00 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/src/kernel/blocks/backup/Backup.cpp
    1.51 05/09/13 14:25:00 mronstrom@stripped +0 -0
    Auto merged

  storage/ndb/src/common/portlib/NdbThread.c
    1.30 05/09/13 14:24:59 mronstrom@stripped +0 -0
    Auto merged

  sql/set_var.h
    1.73 05/09/13 14:24:59 mronstrom@stripped +0 -0
    Auto merged

  sql/set_var.cc
    1.136 05/09/13 14:24:59 mronstrom@stripped +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.151 05/09/13 14:24:59 mronstrom@stripped +0 -0
    Auto merged

# 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:	mronstrom
# Host:	mikael-ronstr-ms-dator.local
# Root:	/Users/mikron/wl2498/RESYNC

--- 1.263/sql/sql_show.cc	2005-09-09 21:05:52 +02:00
+++ 1.264/sql/sql_show.cc	2005-09-13 14:24:59 +02:00
@@ -1057,7 +1057,7 @@
     if (table->s->part_info &&
         ((part_syntax= generate_partition_syntax(table->s->part_info,
                                                   &part_syntax_len,
-                                                  FALSE))))
+                                                  FALSE, FALSE))))
     {
        packet->append(part_syntax, part_syntax_len);
        my_free(part_syntax, MYF(0));