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

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

include/hash.h

@@ -47,7 +47,7 @@ my_bool _hash_init(HASH *hash, CHARSET_INFO *charset,
 		   uint key_length, hash_get_key get_key,
 		   void (*free_element)(void*), uint flags CALLER_INFO_PROTO);
 void hash_free(HASH *tree);
-void hash_reset(HASH *hash);
+void my_hash_reset(HASH *hash);
 byte *hash_element(HASH *hash,uint idx);
 gptr hash_search(HASH *info,const byte *key,uint length);
 gptr hash_next(HASH *info,const byte *key,uint length);

mysql-test/r/bdb.result

@@ -1300,7 +1300,7 @@ insert into t1 values('+ ', '+ ', '+ ');
 set @a=repeat(' ',20);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 Warnings:
-Warning	1265	Data truncated for column 'v' at row 1
+Note	1265	Data truncated for column 'v' at row 1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+*+ *
@@ -1346,7 +1346,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
-Warning	1265	Data truncated for column 't' at row 2
+Note	1265	Data truncated for column 't' at row 2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/r/heap.result

@@ -255,7 +255,7 @@ insert into t1 values('+ ', '+ ', '+ ');
 set @a=repeat(' ',20);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 Warnings:
-Warning	1265	Data truncated for column 'v' at row 1
+Note	1265	Data truncated for column 'v' at row 1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+*+ *

mysql-test/r/myisam.result

@@ -571,7 +571,7 @@ insert into t1 values('+ ', '+ ', '+ ');
 set @a=repeat(' ',20);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 Warnings:
-Warning	1265	Data truncated for column 'v' at row 1
+Note	1265	Data truncated for column 'v' at row 1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+*+ *
@@ -617,7 +617,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
-Warning	1265	Data truncated for column 't' at row 2
+Note	1265	Data truncated for column 't' at row 2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/r/strict.result

@@ -818,7 +818,6 @@ ERROR 01000: Data truncated for column 'col1' at row 1
 INSERT INTO t1 (col2) VALUES ('hellobob');
 ERROR 01000: Data truncated for column 'col2' at row 1
 INSERT INTO t1 (col2) VALUES ('hello  ');
-ERROR 01000: Data truncated for column 'col2' at row 1
 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he';
 ERROR 01000: Data truncated for column 'col1' at row 2
 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he';
@@ -835,6 +834,7 @@ col1	col2
 hello	hello
 he	hellot
 hello	hello 
+NULL	hello 
 hello	hellob
 DROP TABLE t1;
 CREATE TABLE t1 (col1 enum('red','blue','green'));

mysys/hash.c

@@ -122,13 +122,13 @@ void hash_free(HASH *hash)
   Delete all elements from the hash (the hash itself is to be reused).
 
   SYNOPSIS
-    hash_reset()
+    my_hash_reset()
     hash   the hash to delete elements of
 */
 
-void hash_reset(HASH *hash)
+void my_hash_reset(HASH *hash)
 {
-  DBUG_ENTER("hash_reset");
+  DBUG_ENTER("my_hash_reset");
   DBUG_PRINT("enter",("hash: 0x%lxd",hash));
 
   hash_free_elements(hash);

ndb/src/common/portlib/NdbThread.c

@@ -54,7 +54,11 @@ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func,
   strnmov(tmpThread->thread_name,p_thread_name,sizeof(tmpThread->thread_name));
 
   pthread_attr_init(&thread_attr);
+#if (SIZEOF_CHARP == 8)
+  pthread_attr_setstacksize(&thread_attr, 2*thread_stack_size);
+#else
   pthread_attr_setstacksize(&thread_attr, thread_stack_size);
+#endif
 #ifdef USE_PTHREAD_EXTRAS
   /* Guard stack overflow with a 2k databuffer */
   pthread_attr_setguardsize(&thread_attr, 2048);

ndb/src/common/transporter/TransporterRegistry.cpp

@@ -1419,6 +1419,6 @@ NdbOut & operator <<(NdbOut & out, SignalHeader & sh){
 Transporter*
 TransporterRegistry::get_transporter(NodeId nodeId) {
   return theTransporters[nodeId];
-};
+}
 
 template class Vector<TransporterRegistry::Transporter_interface>;

ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp

@@ -14,19 +14,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/**
- * O_DIRECT
- */
-#if 0
-//#ifdef NDB_LINUX
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#endif
-
 #include <ndb_global.h>
+#include <my_sys.h>
+#include <my_pthread.h>
 
-#include "Error.hpp"
+#include <Error.hpp>
 #include "AsyncFile.hpp"
 
 #include <ErrorHandlingMacros.hpp>
@@ -35,15 +27,6 @@
 #include <NdbThread.h>
 #include <signaldata/FsOpenReq.hpp>
 
-#if 0
-#ifdef HAVE_PREAD
-// This is for pread and pwrite
-#ifndef __USE_UNIX98
-#define __USE_UNIX98
-#endif
-#endif
-#endif
-
 #if defined NDB_WIN32 || defined NDB_OSE || defined NDB_SOFTOSE
 #else
 // For readv and writev
@@ -91,6 +74,7 @@ static int numAsyncFiles = 0;
 
 extern "C" void * runAsyncFile(void* arg)
 {
+  my_thread_init();
   ((AsyncFile*)arg)->run();
   return (NULL);
 }
@@ -419,7 +403,7 @@ AsyncFile::readBuffer(char * buf, size_t size, off_t offset){
 #elif defined NDB_OSE || defined NDB_SOFTOSE
     return_value = ::read(theFd, buf, size);
 #else // UNIX
-    return_value = ::pread(theFd, buf, size, offset);
+    return_value = my_pread(theFd, buf, size, offset,0);
 #endif
 #ifndef NDB_WIN32
     if (return_value == -1 && errno == EINTR) {
@@ -653,7 +637,7 @@ AsyncFile::writeBuffer(const char * buf, size_t size, off_t offset,
 #elif defined NDB_OSE || defined NDB_SOFTOSE
     return_value = ::write(theFd, buf, bytes_to_write);
 #else // UNIX
-    return_value = ::pwrite(theFd, buf, bytes_to_write, offset);
+    return_value = my_pwrite(theFd, buf, bytes_to_write, offset, 0);
 #endif
 #ifndef NDB_WIN32
     if (return_value == -1 && errno == EINTR) {
@@ -889,6 +873,7 @@ void AsyncFile::endReq()
 {
   // Thread is ended with return
   if (theWriteBuffer) NdbMem_Free(theWriteBuffer);
+  my_thread_end();
   NdbThread_Exit(0);
 }
 

sql/field.cc

@@ -4672,6 +4672,7 @@ int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)
   uint32 not_used, copy_length;
   char buff[80];
   String tmpstr(buff,sizeof(buff), &my_charset_bin);
+  enum MYSQL_ERROR::enum_warning_level level= MYSQL_ERROR::WARN_LEVEL_WARN;
 
   /* Convert character set if nesessary */
   if (String::needs_conversion(length, cs, field_charset, &not_used))
@@ -4697,10 +4698,23 @@ int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)
   else
     int2store(ptr, copy_length);
 
-  if (copy_length < length)
+  // Check if we lost something other than just trailing spaces
+  if ((copy_length < length) && table->in_use->count_cuted_fields)
+  {
+    const char *end= from + length;
+    from+= copy_length;
+    from+= field_charset->cset->scan(field_charset, from, end, MY_SEQ_SPACES);
+    /*
+      If we lost only spaces then produce a NOTE, not a WARNING.
+      But if we have already had errors (e.g with charset conversion),
+      then don't reset level to NOTE.
+    */
+    if (from == end && !error)
+      level= MYSQL_ERROR::WARN_LEVEL_NOTE;
     error= 1;
+  }
   if (error)
-    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
+    set_warning(level, ER_WARN_DATA_TRUNCATED, 1);
   return error;
 }
 

sql/net_serv.cc

@@ -255,7 +255,7 @@ my_bool
 my_net_write(NET *net,const char *packet,ulong len)
 {
   uchar buff[NET_HEADER_SIZE];
-  if (unlikely(!net->vio)) // nowhere to write
+  if (unlikely(!net->vio))                      /* nowhere to write */
     return 0;
   /*
     Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH

sql/sql_class.h

@@ -742,8 +742,8 @@ class Statement_map
   /* Erase all statements (calls Statement destructor) */
   void reset()
   {
-    hash_reset(&names_hash);
-    hash_reset(&st_hash);
+    my_hash_reset(&names_hash);
+    my_hash_reset(&st_hash);
     last_found_statement= 0;
   }
 

sql/sql_lex.cc

@@ -172,7 +172,7 @@ void lex_start(THD *thd, uchar *buf,uint length)
   lex->proc_list.first= 0;
 
   if (lex->spfuns.records)
-    hash_reset(&lex->spfuns);
+    my_hash_reset(&lex->spfuns);
 }
 
 void lex_end(LEX *lex)