MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Tatjana A Nuernberg Date:August 24 2006 7:13pm
Subject:bk commit into 5.1 tree (tnurnberg:1.2283)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tnurnberg. When tnurnberg 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-08-24 21:12:17+02:00, tnurnberg@stripped +8 -0
  Merge tnurnberg@stripped:/home/bk/mysql-5.1-maint
  into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
  MERGE: 1.2264.1.38

  client/mysql.cc@stripped, 2006-08-24 21:11:57+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.224.1.1

  mysql-test/r/func_time.result@stripped, 2006-08-24 21:11:57+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.69.1.1

  mysql-test/t/func_time.test@stripped, 2006-08-24 21:11:57+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.55.1.1

  mysql-test/t/mysql.test@stripped, 2006-08-24 21:11:57+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.16.1.1

  sql/item_timefunc.cc@stripped, 2006-08-24 21:11:57+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.130.1.1

  sql/slave.cc@stripped, 2006-08-24 21:11:58+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.282.1.1

  sql/sql_acl.cc@stripped, 2006-08-24 21:11:58+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.206.1.1

  tests/mysql_client_test.c@stripped, 2006-08-24 21:11:58+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.206.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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/mysql-5.1-maint/RESYNC

--- 1.225/client/mysql.cc	2006-08-24 21:13:14 +02:00
+++ 1.226/client/mysql.cc	2006-08-24 21:13:14 +02:00
@@ -1957,6 +1957,9 @@ com_charset(String *buffer __attribute__
   if (new_cs)
   {
     charset_info= new_cs;
+    mysql_set_character_set(&mysql, charset_info->csname);
+    default_charset= (char *)charset_info->csname;
+    default_charset_used= 1;
     put_info("Charset changed", INFO_INFO);
   }
   else put_info("Charset is not found", INFO_INFO);

--- 1.131/sql/item_timefunc.cc	2006-08-24 21:13:14 +02:00
+++ 1.132/sql/item_timefunc.cc	2006-08-24 21:13:14 +02:00
@@ -224,7 +224,7 @@ static bool extract_date_time(DATE_TIME_
 	tmp= (char*) val + min(2, val_len);
 	l_time->day= (int) my_strtoll10(val, &tmp, &error);
 	/* Skip 'st, 'nd, 'th .. */
-	val= tmp + min((int) (end-tmp), 2);
+	val= tmp + min((int) (val_end-tmp), 2);
 	break;
 
 	/* Hour */

--- 1.207/sql/sql_acl.cc	2006-08-24 21:13:14 +02:00
+++ 1.208/sql/sql_acl.cc	2006-08-24 21:13:14 +02:00
@@ -1006,6 +1006,7 @@ int acl_getroot(THD *thd, USER_RESOURCES
             sql_print_information("X509 issuer mismatch: should be '%s' "
 			      "but is '%s'", acl_user->x509_issuer, ptr);
           free(ptr);
+          user_access=NO_ACCESS;
           break;
         }
         user_access= acl_user->access;
@@ -1021,11 +1022,13 @@ int acl_getroot(THD *thd, USER_RESOURCES
         if (strcmp(acl_user->x509_subject,ptr))
         {
           if (global_system_variables.log_warnings)
-            sql_print_information("X509 subject mismatch: '%s' vs '%s'",
+            sql_print_information("X509 subject mismatch: should be '%s' but is '%s'",
                             acl_user->x509_subject, ptr);
+          free(ptr);
+          user_access=NO_ACCESS;
+          break;
         }
-        else
-          user_access= acl_user->access;
+        user_access= acl_user->access;
         free(ptr);
       }
       break;

--- 1.17/mysql-test/t/mysql.test	2006-08-24 21:13:14 +02:00
+++ 1.18/mysql-test/t/mysql.test	2006-08-24 21:13:14 +02:00
@@ -52,8 +52,8 @@ drop table t1;
 --exec $MYSQL --default-character-set=cp932 test -e "charset utf8;"
 
 # its usage to switch internally in mysql to requested charset
 

--- 1.207/tests/mysql_client_test.c	2006-08-24 21:13:14 +02:00
+++ 1.208/tests/mysql_client_test.c	2006-08-24 21:13:14 +02:00
@@ -14993,8 +14993,6 @@ static void test_bug17667()
             DIE("Read error");
           }
         }
-        /* Print the line */
-        printf("%s", line_buffer);
 
       } while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2,
             statement_cursor->buffer, statement_cursor->length) == NULL);
Thread
bk commit into 5.1 tree (tnurnberg:1.2283)Tatjana A Nuernberg24 Aug