bk commit into 5.1 tree (svoj:1.2343)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj 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, 2006-10-08 15:32:00+05:00, svoj@stripped +6 -0
  Merge svojtovich@stripped:/home/bk/mysql-5.1
  into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines
  MERGE: 1.2328.14.8

  mysql-test/r/windows.result@stripped, 2006-10-08 15:31:35+05:00, svoj@stripped +0 -1
    Use remote.
    MERGE: 1.2.1.2

  mysql-test/t/windows.test@stripped, 2006-10-08 15:31:50+05:00, svoj@stripped +0 -1
    Use remote.
    MERGE: 1.2.1.1

  sql/share/errmsg.txt@stripped, 2006-10-08 15:23:15+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.125.1.6

  sql/sql_update.cc@stripped, 2006-10-08 15:23:14+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.206.2.1

  storage/csv/ha_tina.cc@stripped, 2006-10-08 15:23:15+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.64.1.1

  storage/myisammrg/ha_myisammrg.cc@stripped, 2006-10-08 15:23:15+05:00, svoj@stripped +0
-0
    Auto merged
    MERGE: 1.102.1.1

# 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:	svoj
# Host:	may.pils.ru
# Root:	/home/svoj/devel/bk/mysql-5.1-engines/RESYNC

--- 1.103/storage/myisammrg/ha_myisammrg.cc	2006-10-08 15:33:29 +05:00
+++ 1.104/storage/myisammrg/ha_myisammrg.cc	2006-10-08 15:33:29 +05:00
@@ -312,9 +312,22 @@
   if (flag & HA_STATUS_CONST)
   {
     if (table->s->key_parts && info.rec_per_key)
+    {
+#ifdef HAVE_purify
+      /*
+        valgrind may be unhappy about it, because optimizer may access values
+        between file->keys and table->key_parts, that will be uninitialized.
+        It's safe though, because even if opimizer will decide to use a key
+        with such a number, it'll be an error later anyway.
+      */
+      bzero((char*) table->key_info[0].rec_per_key,
+            sizeof(table->key_info[0].rec_per_key) * table->key_parts);
+#endif
       memcpy((char*) table->key_info[0].rec_per_key,
 	     (char*) info.rec_per_key,
-	     sizeof(table->key_info[0].rec_per_key)*table->s->key_parts);
+             sizeof(table->key_info[0].rec_per_key) *
+             min(file->keys, table->s->key_parts));
+    }
   }
 }
 

--- 1.208/sql/sql_update.cc	2006-10-08 15:33:29 +05:00
+++ 1.209/sql/sql_update.cc	2006-10-08 15:33:29 +05:00
@@ -1217,6 +1217,8 @@
     TMP_TABLE_PARAM *tmp_param;
 
     table->mark_columns_needed_for_update();
+    if (ignore)
+      table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
     if (table == main_table)			// First table in join
     {
       if (safe_update_on_fly(join->join_tab))
@@ -1331,7 +1333,11 @@
 {
   TABLE_LIST *table;
   for (table= update_tables ; table; table= table->next_local)
+  {
     table->table->no_keyread= table->table->no_cache= 0;
+    if (ignore)
+      table->table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
+  }
 
   if (tmp_tables)
   {

--- 1.129/sql/share/errmsg.txt	2006-10-08 15:33:30 +05:00
+++ 1.130/sql/share/errmsg.txt	2006-10-08 15:33:30 +05:00
@@ -3791,7 +3791,7 @@
         cze "V-B¹echny tabulky v MERGE tabulce nejsou definovány stejnì"
         dan "Tabellerne i MERGE er ikke defineret ens"
         nla "Niet alle tabellen in de MERGE tabel hebben identieke gedefinities"
-        eng "Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exists"
+        eng "Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exist"
         est "Kõik tabelid MERGE tabeli määratluses ei ole identsed"
         fre "Toutes les tables de la table de type MERGE n'ont pas la même définition"
         ger "Nicht alle Tabellen in der MERGE-Tabelle sind gleich definiert"

--- 1.65/storage/csv/ha_tina.cc	2006-10-08 15:33:30 +05:00
+++ 1.66/storage/csv/ha_tina.cc	2006-10-08 15:33:30 +05:00
@@ -1535,6 +1535,7 @@
   "CSV",
   "Brian Aker, MySQL AB",
   "CSV storage engine",
+  PLUGIN_LICENSE_GPL,
   tina_init_func, /* Plugin Init */
   tina_done_func, /* Plugin Deinit */
   0x0100 /* 1.0 */,