bzr push into mysql-trunk branch (tor.didriksen:3769 to 3770)

[Tor Didriksen]

 3770 Tor Didriksen	2012-03-14
      Fix broken build: uint != size_t !!!

    modified:
      sql/sql_table.cc
      sql/sql_table.h
 3769 Alfranio Correia	2012-03-14
      Post-push fix for BUG#13504281.
      
      Fixed result file for the test case disabled_replication.test and
      disabled its execution on embedded mode as replication code is
      disabled in such cases.

    modified:
      mysql-test/r/disabled_replication.result
      mysql-test/t/disabled_replication.test
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2012-03-14 11:56:51 +0000
+++ b/sql/sql_table.cc	2012-03-14 12:52:51 +0000
@@ -3842,7 +3842,7 @@ mysql_prepare_create_table(THD *thd, HA_
                                 INDEX_COMMENT_MAXLEN,
                                 ER_TOO_LONG_INDEX_COMMENT,
                                 key_info->name))
-       DBUG_RETURN(-1);
+       DBUG_RETURN(true);
     key_info->comment.length= key->key_create_info.comment.length;
     if (key_info->comment.length > 0)
     {
@@ -3922,7 +3922,7 @@ mysql_prepare_create_table(THD *thd, HA_
 */
 
 bool validate_comment_length(THD *thd, const char *comment_str,
-                             uint *comment_len, uint max_len,
+                             size_t *comment_len, uint max_len,
                              uint err_code, const char *comment_name)
 {
   int length= 0;
@@ -4258,7 +4258,7 @@ bool mysql_create_table_no_lock(THD *thd
     {
       if (part_elem->part_comment)
       {
-        uint comment_len= strlen(part_elem->part_comment);
+        size_t comment_len= strlen(part_elem->part_comment);
         if (validate_comment_length(thd, part_elem->part_comment,
                                      &comment_len,
                                      TABLE_PARTITION_COMMENT_MAXLEN,
@@ -4275,7 +4275,7 @@ bool mysql_create_table_no_lock(THD *thd
         {
           if (subpart_elem->part_comment)
           {
-            uint comment_len= strlen(subpart_elem->part_comment);
+            size_t comment_len= strlen(subpart_elem->part_comment);
             if (validate_comment_length(thd, subpart_elem->part_comment,
                                          &comment_len,
                                          TABLE_PARTITION_COMMENT_MAXLEN,

=== modified file 'sql/sql_table.h'
--- a/sql/sql_table.h	2012-02-06 15:09:32 +0000
+++ b/sql/sql_table.h	2012-03-14 12:52:51 +0000
@@ -217,7 +217,7 @@ void release_ddl_log();
 void execute_ddl_log_recovery();
 bool execute_ddl_log_entry(THD *thd, uint first_entry);
 bool validate_comment_length(THD *thd, const char *comment_str,
-                             uint *comment_len, uint max_len,
+                             size_t *comment_len, uint max_len,
                              uint err_code, const char *comment_name);
 
 template<typename T> class List;

No bundle (reason: useless for push emails).