Commit 81e8630e authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0
parents e9972011 e036d3cf

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1109,3 +1109,4 @@ vio/viotest-ssl 
VC++Files/client/mysql_amd64.dsp

client/mysqltestmanager-pwgen

client/mysqltestmanagerc

tools/mysqltestmanager

client/mysqltest.c

+9 −2
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char* fname) 
  {

    DBUG_PRINT("info",("Size differs:  result size: %u  file size: %u",

		       ds->length, stat_info.st_size));

    DBUG_PRINT("info",("result: '%s'", ds->str));

    DBUG_RETURN(2);

  }

  if (!(tmp = (char*) my_malloc(stat_info.st_size + 1, MYF(MY_WME))))
@@ -3623,8 +3624,8 @@ static void init_var_hash(MYSQL *mysql) 
  if (hash_init(&var_hash, charset_info, 

                1024, 0, 0, get_var_key, var_free, MYF(0)))

    die("Variable hash initialization failed");

  if (opt_big_test)

    my_hash_insert(&var_hash, (byte*) var_init(0,"BIG_TEST", 0, "1",0));

  my_hash_insert(&var_hash, (byte*) var_init(0,"BIG_TEST", 0,

                                             (opt_big_test) ? "1" : "0", 0));

  v= var_init(0,"MAX_TABLES", 0, (sizeof(ulong) == 4) ? "31" : "62",0);

  my_hash_insert(&var_hash, (byte*) v);

  v= var_init(0,"SERVER_VERSION", 0, mysql_get_server_info(mysql), 0);
@@ -3793,6 +3794,12 @@ int main(int argc, char **argv) 
	if (q->query == q->query_buf)

	  q->query += q->first_word_len + 1;

	display_result_vertically= (q->type==Q_QUERY_VERTICAL);

	if (save_file[0])

	{

	  strmov(q->record_file,save_file);

	  q->require_file=require_file;

	  save_file[0]=0;

	}

	error|= run_query(&cur_con->mysql, q, QUERY_REAP|QUERY_SEND);

	display_result_vertically= old_display_result_vertically;

	break;

mysql-test/include/big_test.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/big_test.require

disable_query_log;

eval select $BIG_TEST as using_big_test;

enable_query_log;

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ start_master() 
          --default-character-set=$CHARACTER_SET \

          --tmpdir=$MYSQL_TMP_DIR \

          --language=$LANGUAGE \

          --innodb_data_file_path=ibdata1:50M \

          --innodb_data_file_path=ibdata1:128M:autoextend \

	  --open-files-limit=1024 \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \
@@ -1200,7 +1200,7 @@ start_master() 
          $USE_NDBCLUSTER \

          --tmpdir=$MYSQL_TMP_DIR \

          --language=$LANGUAGE \

          --innodb_data_file_path=ibdata1:50M \

          --innodb_data_file_path=ibdata1:128M:autoextend \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \

mysql-test/r/heap.result

+30 −30
Original line number Diff line number Diff line
@@ -436,8 +436,8 @@ f 10 
g	10

h	10

i	10

select sql_big_result v,count(t) from t1 group by v limit 10;

v	count(t)

select sql_big_result trim(v),count(t) from t1 group by v limit 10;

trim(v)	count(t)

a	1

a	10

b	10
@@ -448,8 +448,8 @@ f 10 
g	10

h	10

i	10

select sql_big_result v,count(c) from t1 group by v limit 10;

v	count(c)

select sql_big_result trim(v),count(c) from t1 group by v limit 10;

trim(v)	count(c)

a	1

a	10

b	10
@@ -520,8 +520,8 @@ f 10 
g	10

h	10

i	10

select sql_big_result t,count(t) from t1 group by t limit 10;

t	count(t)

select sql_big_result trim(t),count(t) from t1 group by t limit 10;

trim(t)	count(t)

a	1

a	10

b	10