bzr push into mysql-5.1 branch (zhou.li:3167 to 3168)

[Leonard Zhou]

 3168 Leonard Zhou	2008-12-10 [merge]
      Merge 6.3 to 6.4
modified:
  sql/sql_yacc.yy

 3167 Frazer Clement	2008-12-09
      WL4258 Long Signal Transactions
      
      Previous work in WL4258 modified NdbRecord based PK and UK operations to 
      send long signals to the kernel while non-NdbRecord PK and UK operations
      continued to send 'short' signals.
      
      This patch modifies NDBAPI to send long signals for non-NdbRecord PK and
      UK operations so that after this patch, *all* operations are sent using long signals.
      
      Most of the modifications are limited to the send-phase.
modified:
  storage/ndb/src/ndbapi/NdbOperationExec.cpp
  storage/ndb/src/ndbapi/NdbOperationSearch.cpp
  storage/ndb/src/ndbapi/NdbScanOperation.cpp

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2008-11-21 21:06:44 +0000
+++ b/sql/sql_yacc.yy	2008-12-10 05:57:58 +0000
@@ -3662,7 +3662,7 @@ ts_wait:
         ;
 
 size_number:
-          real_ulong_num { $$= $1;}
+          real_ulonglong_num { $$= $1;}
         | IDENT
           {
             ulonglong number;