Merge mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0-ndb

.bzrignore

@@ -959,3 +959,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+ac_available_languages_fragment

configure.in

@@ -3172,7 +3172,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
  AC_OUTPUT
 
-rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
 echo
 echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the"
 echo "latest release, upcoming features, and other information to make your"

mysql-test/r/rpl_rewrite_db.result

@@ -67,9 +67,9 @@ drop table t1;
 create table t1 (a int, b char(10));
 load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
 Warnings:
-Warning	1265	Data truncated for column 'a' at row 3
+Warning	1264	Out of range value adjusted for column 'a' at row 3
 Warning	1262	Row 3 was truncated; it contained more data than there were input columns
-Warning	1265	Data truncated for column 'a' at row 5
+Warning	1264	Out of range value adjusted for column 'a' at row 5
 Warning	1262	Row 5 was truncated; it contained more data than there were input columns
 select * from rewrite.t1;
 a	b
@@ -81,7 +81,7 @@ a	b
 truncate table t1;
 load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
 Warnings:
-Warning	1265	Data truncated for column 'a' at row 4
+Warning	1264	Out of range value adjusted for column 'a' at row 4
 Warning	1261	Row 4 doesn't contain data for all columns
 select * from rewrite.t1;
 a	b

server-tools/instance-manager/mysqlmanager.cc

@@ -232,8 +232,7 @@ spawn:
       sigsuspend(&zeromask);
 
     if (is_terminated)
-      log_info("angel got signal %d (%s), exiting",
-               is_terminated, sys_siglist[is_terminated]);
+      log_info("angel got signal %d, exiting", is_terminated);
     else if (child_status == CHILD_NEED_RESPAWN)
     { 
       child_status= CHILD_OK;

sql/ha_innodb.cc

@@ -4687,7 +4687,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list)
   update_thd(current_thd);
   prebuilt->trx->op_info = (char*)"getting list of foreign keys";
   trx_search_latch_release_if_reserved(prebuilt->trx);
-  mutex_enter(&(dict_sys->mutex));
+  mutex_enter_noninline(&(dict_sys->mutex));
   foreign = UT_LIST_GET_FIRST(prebuilt->table->foreign_list);
 
   while (foreign != NULL) 
@@ -4768,7 +4768,7 @@ ha_innobase::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list)
     f_key_list->push_back(pf_key_info);
     foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
   }
-  mutex_exit(&(dict_sys->mutex));
+  mutex_exit_noninline(&(dict_sys->mutex));
   prebuilt->trx->op_info = (char*)"";
   DBUG_RETURN(0);
 }

sql/sql_parse.cc

@@ -1627,8 +1627,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
 	break;
       mysql_log.write(thd,command,packet);
       bzero(&create_info, sizeof(create_info));
-      error= mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
-                             &create_info, 0);
+      mysql_create_db(thd, (lower_case_table_names == 2 ? alias : db),
+                      &create_info, 0);
       break;
     }
   case COM_DROP_DB:				// QQ: To be removed
@@ -1651,8 +1651,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
 	break;
       }
       mysql_log.write(thd,command,db);
-      error= mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db),
-                         0, 0) ;
+      mysql_rm_db(thd, (lower_case_table_names == 2 ? alias : db),
+                       0, 0);
       break;
     }
 #ifndef EMBEDDED_LIBRARY

sql/sql_show.cc

@@ -1211,7 +1211,7 @@ view_store_create_info(THD *thd, TABLE_LIST *table, String *buff)
   if (!foreign_db_mode)
   {
     buff->append("ALGORITHM=", 10);
-    switch(table->algorithm)
+    switch((int8)table->algorithm)
     {
     case VIEW_ALGORITHM_UNDEFINED:
       buff->append("UNDEFINED ", 10);