bk commit into 5.0 tree (lars:1.2367)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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@stripped, 2007-01-12 12:22:54+01:00, lars@stripped +16 -0
  Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
  into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
  MERGE: 1.2344.1.7

  client/mysqlbinlog.cc@stripped, 2007-01-12 12:22:48+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.130.1.1

  client/mysqldump.c@stripped, 2007-01-12 12:22:48+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.252.1.1

  include/my_pthread.h@stripped, 2007-01-12 12:22:48+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.92.1.1

  mysql-test/t/disabled.def@stripped, 2007-01-12 12:22:48+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.36.1.2

  mysys/my_thr_init.c@stripped, 2007-01-12 12:22:48+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.34.1.1

  sql/item_timefunc.cc@stripped, 2007-01-12 12:22:48+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.138.1.1

  sql/log.cc@stripped, 2007-01-12 12:22:48+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.198.1.1

  sql/log_event.cc@stripped, 2007-01-12 12:22:49+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.214.1.3

  sql/log_event.h@stripped, 2007-01-12 12:22:49+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.126.2.2

  sql/mysql_priv.h@stripped, 2007-01-12 12:22:49+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.425.1.1

  sql/set_var.cc@stripped, 2007-01-12 12:22:49+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.173.1.2

  sql/set_var.h@stripped, 2007-01-12 12:22:49+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.78.1.2

  sql/sp_head.cc@stripped, 2007-01-12 12:22:49+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.225.1.2

  sql/sql_acl.cc@stripped, 2007-01-12 12:22:49+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.214.1.1

  sql/sql_locale.cc@stripped, 2007-01-12 12:22:50+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.7.1.1

  sql/sql_parse.cc@stripped, 2007-01-12 12:22:50+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.595.1.2

# 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:	lars
# Host:	dl145j.mysql.com
# Root:	/nfsdisk1/lars/MERGE/mysql-5.0-merge/RESYNC

--- 1.253/client/mysqldump.c	2007-01-12 12:23:01 +01:00
+++ 1.254/client/mysqldump.c	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.93/include/my_pthread.h	2007-01-12 12:23:01 +01:00
+++ 1.94/include/my_pthread.h	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.35/mysys/my_thr_init.c	2007-01-12 12:23:01 +01:00
+++ 1.36/mysys/my_thr_init.c	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.140/sql/item_timefunc.cc	2007-01-12 12:23:01 +01:00
+++ 1.141/sql/item_timefunc.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.199/sql/log.cc	2007-01-12 12:23:01 +01:00
+++ 1.200/sql/log.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.222/sql/log_event.cc	2007-01-12 12:23:01 +01:00
+++ 1.223/sql/log_event.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.129/sql/log_event.h	2007-01-12 12:23:01 +01:00
+++ 1.130/sql/log_event.h	2007-01-12 12:23:01 +01:00
@@ -1,9 +1,8 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.426/sql/mysql_priv.h	2007-01-12 12:23:01 +01:00
+++ 1.427/sql/mysql_priv.h	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.131/client/mysqlbinlog.cc	2007-01-12 12:23:01 +01:00
+++ 1.132/client/mysqlbinlog.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.215/sql/sql_acl.cc	2007-01-12 12:23:01 +01:00
+++ 1.216/sql/sql_acl.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.596/sql/sql_parse.cc	2007-01-12 12:23:01 +01:00
+++ 1.597/sql/sql_parse.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -7040,6 +7039,7 @@ bool mysql_create_index(THD *thd, TABLE_
   bzero((char*) &create_info,sizeof(create_info));
   create_info.db_type=DB_TYPE_DEFAULT;
   create_info.default_table_charset= thd->variables.collation_database;
+  create_info.row_type= ROW_TYPE_NOT_USED;
   DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->table_name,
 				&create_info, table_list,
 				fields, keys, 0, (ORDER*)0,
@@ -7056,6 +7056,7 @@ bool mysql_drop_index(THD *thd, TABLE_LI
   bzero((char*) &create_info,sizeof(create_info));
   create_info.db_type=DB_TYPE_DEFAULT;
   create_info.default_table_charset= thd->variables.collation_database;
+  create_info.row_type= ROW_TYPE_NOT_USED;
   alter_info->clear();
   alter_info->flags= ALTER_DROP_INDEX;
   DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->table_name,

--- 1.9/sql/sql_locale.cc	2007-01-12 12:23:01 +01:00
+++ 1.10/sql/sql_locale.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.38/mysql-test/t/disabled.def	2007-01-12 12:23:01 +01:00
+++ 1.39/mysql-test/t/disabled.def	2007-01-12 12:23:01 +01:00
@@ -10,6 +10,7 @@
 #
 ##############################################################################
 
+im_daemon_life_cycle     : Bug#24415  see note: [19 Dec 23:17] Trudy Pelzer
 ndb_load        : Bug#17233
 user_limits     : Bug#23921 random failure of user_limits.test
 flush2          : Bug#24805 Pushbuild can't handle test with --disable-log-bin

--- 1.175/sql/set_var.cc	2007-01-12 12:23:01 +01:00
+++ 1.176/sql/set_var.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -904,6 +903,7 @@ struct show_var_st init_vars[]= {
   {sys_innodb_max_purge_lag.name, (char*) &sys_innodb_max_purge_lag, SHOW_SYS},
   {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG},
   {"innodb_open_files", (char*) &innobase_open_files, SHOW_LONG },
+  {"innodb_rollback_on_timeout", (char*) &innobase_rollback_on_timeout,
SHOW_MY_BOOL},
   {sys_innodb_support_xa.name, (char*) &sys_innodb_support_xa, SHOW_SYS},
   {sys_innodb_sync_spin_loops.name, (char*) &sys_innodb_sync_spin_loops, SHOW_SYS},
   {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS},

--- 1.79/sql/set_var.h	2007-01-12 12:23:01 +01:00
+++ 1.80/sql/set_var.h	2007-01-12 12:23:01 +01:00
@@ -1,9 +1,8 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2002-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

--- 1.228/sql/sp_head.cc	2007-01-12 12:23:01 +01:00
+++ 1.229/sql/sp_head.cc	2007-01-12 12:23:01 +01:00
@@ -2,8 +2,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of