List:Commits« Previous MessageNext Message »
From:mikael Date:January 17 2006 6:19am
Subject:bk commit into 5.1 tree (mikron:1.2057)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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
  1.2057 06/01/17 07:19:14 mikron@stripped +6 -0
  Merge c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/Users/mikron/clean-mysql-5.1-new
  into  c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/Users/mikron/clean-wl2604

  sql/sql_partition.cc
    1.43 06/01/17 07:19:03 mikron@stripped +0 -1
    Manual merge

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.87 06/01/17 07:16:34 mikron@stripped +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.432 06/01/17 07:16:33 mikron@stripped +0 -0
    Auto merged

  sql/sql_table.cc
    1.299 06/01/17 07:16:32 mikron@stripped +0 -0
    Auto merged

  sql/sql_show.cc
    1.287 06/01/17 07:16:31 mikron@stripped +0 -0
    Auto merged

  sql/sql_base.cc
    1.288 06/01/17 07:16:29 mikron@stripped +0 -0
    Auto merged

# 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:	mikron
# Host:	c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
# Root:	/Users/mikron/clean-wl2604/RESYNC

--- 1.287/sql/sql_base.cc	2006-01-16 23:59:59 +01:00
+++ 1.288/sql/sql_base.cc	2006-01-17 07:16:29 +01:00
@@ -2083,8 +2083,10 @@
     (*field)->table_name= &table->alias;
   }
   for (key=0 ; key < table->s->keys ; key++)
+  {
     for (part=0 ; part < table->key_info[key].usable_key_parts ; part++)
       table->key_info[key].key_part[part].field->table= table;
+  }
   if (table->triggers)
     table->triggers->set_table(table);
 

--- 1.286/sql/sql_show.cc	2006-01-16 23:59:59 +01:00
+++ 1.287/sql/sql_show.cc	2006-01-17 07:16:31 +01:00
@@ -2734,12 +2734,15 @@
         field->real_type() == MYSQL_TYPE_VARCHAR ||  // For varbinary type
         field->real_type() == MYSQL_TYPE_STRING)     // For binary type
     {
+      uint32 octet_max_length= field->max_length();
+      if (octet_max_length != (uint32) 4294967295U)
+        octet_max_length /= field->charset()->mbmaxlen;
       longlong char_max_len= is_blob ? 
-        (longlong) field->max_length() / field->charset()->mbminlen :
-        (longlong) field->max_length() / field->charset()->mbmaxlen;
+        (longlong) octet_max_length / field->charset()->mbminlen :
+        (longlong) octet_max_length / field->charset()->mbmaxlen;
       table->field[8]->store(char_max_len, TRUE);
       table->field[8]->set_notnull();
-      table->field[9]->store((longlong) field->max_length(), TRUE);
+      table->field[9]->store((longlong) octet_max_length, TRUE);
       table->field[9]->set_notnull();
     }
 

--- 1.298/sql/sql_table.cc	2006-01-17 04:36:10 +01:00
+++ 1.299/sql/sql_table.cc	2006-01-17 07:16:32 +01:00
@@ -1739,7 +1739,7 @@
 	my_error(ER_WRONG_KEY_COLUMN, MYF(0), column->field_name);
 	  DBUG_RETURN(-1);
       }
-      if (length > file->max_key_part_length())
+      if (length > file->max_key_part_length() && key->type != Key::FULLTEXT)
       {
 	length=file->max_key_part_length();
 	if (key->type == Key::MULTIPLE)

--- 1.431/sql/sql_yacc.yy	2006-01-17 00:00:00 +01:00
+++ 1.432/sql/sql_yacc.yy	2006-01-17 07:16:33 +01:00
@@ -6865,13 +6865,13 @@
 	| table_ref LEFT opt_outer JOIN_SYM table_ref
           ON
           {
+            YYERROR_UNLESS($1 && $5);
             /* Change the current name resolution context to a local context. */
             if (push_new_name_resolution_context(YYTHD, $1, $5))
               YYABORT;
           }
           expr
 	  {
-            YYERROR_UNLESS($1 && $5);
             add_join_on($5,$8);
             Lex->pop_context();
             $5->outer_join|=JOIN_TYPE_LEFT;
@@ -6896,6 +6896,7 @@
 	| table_ref RIGHT opt_outer JOIN_SYM table_ref
           ON
           {
+            YYERROR_UNLESS($1 && $5);
             /* Change the current name resolution context to a local context. */
             if (push_new_name_resolution_context(YYTHD, $1, $5))
               YYABORT;
@@ -6903,7 +6904,6 @@
           expr
           {
 	    LEX *lex= Lex;
-            YYERROR_UNLESS($1 && $5);
             if (!($$= lex->current_select->convert_right_join()))
               YYABORT;
             add_join_on($$, $8);

--- 1.86/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-01-16 17:01:56 +01:00
+++ 1.87/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-01-17 07:16:34 +01:00
@@ -5785,6 +5785,9 @@
     errorReport(signal, 1);
     return;
   }//if
+  if (ERROR_INSERTED(5042)) {
+    ndbrequire(false);
+  }
   if (ERROR_INSERTED(5013)) {
     CLEAR_ERROR_INSERT_VALUE;
     sendSignalWithDelay(cownref, GSN_COMPLETE, signal, 2000, 3);

--- 1.42/sql/sql_partition.cc	2006-01-16 17:46:48 +01:00
+++ 1.43/sql/sql_partition.cc	2006-01-17 07:19:03 +01:00
@@ -2668,8 +2668,8 @@
                                Item *part_expr)
 {
   DBUG_ENTER("get_part_id_hash");
-
-  DBUG_RETURN((uint32)(part_expr->val_int() % no_parts));
+  longlong int_hash_id= part_expr->val_int() % no_parts;
+  DBUG_RETURN(int_hash_id < 0 ? -int_hash_id : int_hash_id);
 }
 
 
Thread
bk commit into 5.1 tree (mikron:1.2057)mikael17 Jan