Commit c4532ab8 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/r/rpl_err_ignoredtable.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_log.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_err_ignoredtable.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_stm_log-master.opt:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
parents 2d6a5f29 ec5bdb51

mysql-test/include/mix1.inc

+0 −6
Original line number Diff line number Diff line
@@ -342,12 +342,6 @@ SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 
DROP TABLE t1,t2;



#

# Bug#17530: Incorrect key truncation on table creation caused server crash.

#

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

  character set utf8 collate utf8_general_ci;

insert into t1 values('aaa');

drop table t1;

# Test of behaviour with CREATE ... SELECT

#

mysql-test/r/innodb_mysql.result

+0 −6
Original line number Diff line number Diff line
@@ -300,12 +300,6 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

character set utf8 collate utf8_general_ci;

Warnings:

Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;

CREATE TABLE t1 (a int, b int);

insert into t1 values (1,1),(1,2);

CREATE TABLE t2 (primary key (a)) select * from t1;

sql/sql_trigger.cc

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) 
      thd->clear_error();



      /* Such a statement can always go directly to binlog, no trans cache. */

      thd->binlog_query(THD::MYSQL_QUERY_TYPE,

      thd->binlog_query(THD::STMT_QUERY_TYPE,

                        stmt_query.ptr(), stmt_query.length(), FALSE, FALSE);

    }

  }

sql/sql_view.cc

+14 −3
Original line number Diff line number Diff line
@@ -1417,6 +1417,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) 
    query_cache_invalidate3(thd, view, 0);

    sp_cache_invalidate();

  }



  if (mysql_bin_log.is_open())

  {

    thd->clear_error();
@@ -1424,24 +1425,34 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) 
                      thd->query, thd->query_length, FALSE, FALSE);

  }



  VOID(pthread_mutex_unlock(&LOCK_open));



  if (error)

  {

    VOID(pthread_mutex_unlock(&LOCK_open));

    DBUG_RETURN(TRUE);

  }

  if (wrong_object_name)

  {

    VOID(pthread_mutex_unlock(&LOCK_open));

    my_error(ER_WRONG_OBJECT, MYF(0), wrong_object_db, wrong_object_name, 

             "VIEW");

    DBUG_RETURN(TRUE);

  }

  if (non_existant_views.length())

  {

    VOID(pthread_mutex_unlock(&LOCK_open));

    my_error(ER_BAD_TABLE_ERROR, MYF(0), non_existant_views.c_ptr());

    DBUG_RETURN(TRUE);

  }



  if (mysql_bin_log.is_open())

  {

    thd->clear_error();

    thd->binlog_query(THD::STMT_QUERY_TYPE,

                      thd->query, thd->query_length, FALSE, FALSE);

  }



  send_ok(thd);

  VOID(pthread_mutex_unlock(&LOCK_open));

  DBUG_RETURN(FALSE);

}

sql/stacktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ terribly wrong...\n"); 


#if defined(__alpha__) && defined(__GNUC__)

    uchar** new_fp = find_prev_fp(pc, fp);

    if (frame_count == SIGRETURN_FRAME_COUNT - 1)

    if (frame_count == sigreturn_frame_count - 1)

    {

      new_fp += 90;

    }