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

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

configure.in

@@ -1910,7 +1910,7 @@ if test "$GCC" != "yes"; then
   AC_SYS_COMPILER_FLAG(-nolib_inline,nolib_inline,CFLAGS,[],[])
 fi
 
-AC_FUNC_MMAP
+#AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 MYSQL_TYPE_QSORT
 AC_FUNC_UTIME_NULL
@@ -1921,7 +1921,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \
   getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \
   getpwuid getrlimit getrusage getwd gmtime_r index initgroups isnan \
   localtime_r locking longjmp lrand48 madvise mallinfo memcpy memmove \
-  mkstemp mlockall perror poll pread pthread_attr_create \
+  mkstemp mlockall perror poll pread pthread_attr_create mmap \
   pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \
   pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \
   pthread_key_delete pthread_rwlock_rdlock pthread_setprio \

dbug/Makefile.am

@@ -36,10 +36,10 @@ dbug_analyze_SOURCES =  dbug_analyze.c
 all:            user.t user.ps
 
 user.t:         user.r $(NROFF_INC)
-		nroff -mm user.r > $@
+		-nroff -mm user.r > $@
 
 user.ps:	user.r $(NROFF_INC)
-		groff -mm user.r > $@
+		-groff -mm user.r > $@
 
 output1.r:      factorial
 		./factorial 1 2 3 4 5 | cat > $@

include/my_pthread.h

@@ -702,7 +702,6 @@ static inline bool thread_safe_dec_and_test(ulong V, pthread_mutex_t *L)
   a regular function somewhere in mysys/  ?
   for now it's only used in c++ code, so there's no need to bother
 */
-#warning "No thread_safe_dec_and_test() for this architecture"
 #endif
 #endif /* HAVE_ATOMIC_ADD */
 #ifdef SAFE_STATISTICS

mysql-test/r/information_schema.result

@@ -439,3 +439,9 @@ v
 call px5()//
 v
 9
+create table t1 (a int not null auto_increment,b int, primary key (a));
+insert into t1 values (1,1),(NULL,3),(NULL,4);
+select AUTO_INCREMENT from information_schema.tables where table_name = 't1';
+AUTO_INCREMENT
+4
+drop table t1;

mysql-test/t/information_schema.test

@@ -218,7 +218,8 @@ call px5()//
 call px5()//
 delimiter ;//
 
-
-
-
+create table t1 (a int not null auto_increment,b int, primary key (a));
+insert into t1 values (1,1),(NULL,3),(NULL,4);
+select AUTO_INCREMENT from information_schema.tables where table_name = 't1';
+drop table t1;
  
\ No newline at end of file

sql/field.cc

@@ -1785,7 +1785,6 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
   longlong tmp;
   long store_tmp;
   int error;
-  bool warning_given= 0;
   char *end;
   
   tmp= cs->cset->scan(cs, from, from+len, MY_SEQ_SPACES);
@@ -2075,8 +2074,7 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)
   longlong tmp;
   int error= 0;
   char *end;
-  bool warning_given;
-  
+
   tmp= cs->cset->scan(cs, from, from+len, MY_SEQ_SPACES);
   len-= (uint)tmp;
   from+= tmp;

sql/item_func.cc

@@ -174,7 +174,7 @@ bool Item_func::agg_arg_charsets(DTCollation &coll,
   for (arg= args, last= args + nargs; arg < last; arg++)
   {
     Item* conv;
-    uint dummy_offset;
+    uint32 dummy_offset;
     if (!String::needs_conversion(0, coll.collation,
                                   (*arg)->collation.collation,
                                   &dummy_offset))

sql/opt_range.cc

@@ -5533,7 +5533,6 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
       goto err;
   }
 
-ok:
   thd->mem_root= old_root;
   return quick;
 
@@ -8067,7 +8066,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range()
       boundary of cur_range, there is no need to check this range.
     */
     if (range_idx != 0 && !(cur_range->flag & NO_MAX_RANGE) &&
-        (key_cmp(min_max_arg_part, cur_range->max_key, min_max_arg_len) == 1))
+        (key_cmp(min_max_arg_part, (byte*) cur_range->max_key,
+                 min_max_arg_len) == 1))
       continue;
 
     if (cur_range->flag & NO_MIN_RANGE)
@@ -8193,7 +8193,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range()
     */
     if (range_idx != min_max_ranges.elements &&
         !(cur_range->flag & NO_MIN_RANGE) &&
-        (key_cmp(min_max_arg_part, cur_range->min_key, min_max_arg_len) == -1))
+        (key_cmp(min_max_arg_part, (byte*) cur_range->min_key,
+                 min_max_arg_len) == -1))
       continue;
 
     if (cur_range->flag & NO_MAX_RANGE)

sql/sp_pcontext.h

@@ -50,7 +50,7 @@ typedef struct sp_label
   char *name;
   uint ip;			// Instruction index
   int type;			// begin/iter or ref/free 
-  struct sp_pcontext *ctx;	// The label's context
+  sp_pcontext *ctx;             // The label's context
 } sp_label_t;
 
 typedef struct sp_cond_type

sql/sql_show.cc

@@ -2116,7 +2116,7 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
     }
     table->field[11]->store((longlong) file->index_file_length);
     table->field[12]->store((longlong) file->delete_length);
-    if (table->found_next_number_field)
+    if (show_table->found_next_number_field)
     {
       show_table->next_number_field=show_table->found_next_number_field;
       show_table->next_number_field->reset();
@@ -2196,12 +2196,16 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
     table->field[19]->store(option_buff+1,
                             (ptr == option_buff ? 0 : 
                              (uint) (ptr-option_buff)-1), cs);
-
-    char *comment= show_table->file->
-      update_table_comment(show_table->comment);
-    table->field[20]->store(comment, strlen(comment), cs);
-    if (comment != show_table->comment)
-      my_free(comment,MYF(0));
+    {
+      char *comment= show_table->file->
+        update_table_comment(show_table->comment);
+      if (comment)
+      {
+        table->field[20]->store(comment, strlen(comment), cs);
+        if (comment != show_table->comment)
+          my_free(comment,MYF(0));
+      }
+    }
   }
   table->file->write_row(table->record[0]);
   DBUG_RETURN(0);

sql/table.h

@@ -274,7 +274,7 @@ typedef struct st_schema_table
 #define VIEW_CHECK_SKIP       2
 
 struct st_lex;
-struct select_union;
+class select_union;
 
 typedef struct st_table_list
 {