Commit 9f6cf5b6 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/my/mysql-5.1


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
parents b002c117 8ac1d552

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1758,3 +1758,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

mysql-test/r/*.log

client/mysqltest.c

+7 −5
Original line number Diff line number Diff line
@@ -209,9 +209,9 @@ struct st_replace_regex 
   */

  char* buf;

  char* even_buf;

  uint even_buf_len;

  char* odd_buf;

  uint odd_buf_len;

  int even_buf_len;

  int odd_buf_len;

};



struct st_replace_regex *glob_replace_regex= 0;
@@ -1279,6 +1279,7 @@ int var_query_set(VAR* var, const char *query, const char** query_end) 
  MYSQL_ROW row;

  MYSQL* mysql = &cur_con->mysql;

  LINT_INIT(res);

  DBUG_ENTER("var_query_set");



  while (end > query && *end != '`')

    --end;
@@ -1340,7 +1341,7 @@ int var_query_set(VAR* var, const char *query, const char** query_end) 
    eval_expr(var, "", 0);



  mysql_free_result(res);

  return 0;

  DBUG_RETURN(0);

}



void var_copy(VAR *dest, VAR *src)
@@ -1517,6 +1518,7 @@ void do_system(struct st_query *command) 
  }



  command->last_argument= command->end;

  dynstr_free(&ds_cmd);

  DBUG_VOID_RETURN;

}
@@ -1557,7 +1559,7 @@ int do_echo(struct st_query *command) 
  dynstr_append_mem(ds, "\n", 1);

  dynstr_free(&ds_echo);

  command->last_argument= command->end;

  return 0;

  return(0);

}
@@ -1660,7 +1662,7 @@ int do_save_master_pos() 


    if (have_ndbcluster)

    {

      ulonglong epoch, tmp_epoch= 0;

      ulonglong epoch=0, tmp_epoch= 0;

      int count= 0;



      do

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ report_stats () { 


    found_error=0

    # Find errors

    for i in "^Warning:" "^Error:" "^==.* at 0x" "InnoDB: Warning"

    for i in "^Warning:" "^Error:" "^==.* at 0x" "InnoDB: Warning" "missing DBUG_RETURN"

    do

      if $GREP "$i" $MY_LOG_DIR/warnings.tmp >> $MY_LOG_DIR/warnings

      then

mysql-test/r/lock_multi.result

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,13 @@ drop table t2; 
ERROR 42S02: Table 'test.t2' doesn't exist

drop table t1;

create table t1 (a int);

create table t2 (a int);

lock table t1 write, t2 write, t1 as t1_2 write, t2 as t2_2 write;

 insert t1 select * from t2;

drop table t2;

ERROR 42S02: Table 'test.t2' doesn't exist

drop table t1;

create table t1(a int);

lock tables t1 write;

show columns from t1;

Field	Type	Null	Key	Default	Extra

mysql-test/r/ndb_condition_pushdown.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1,t2;

DROP TABLE IF EXISTS t1,t2,t3,t4;

CREATE TABLE t1 (

auto int(5) unsigned NOT NULL auto_increment,

string char(10),