Commit 1125dfd6 authored by Kristofer Pettersson's avatar Kristofer Pettersson
Browse files

Automerge

parents b3bb760c 58701cae

client/mysqlcheck.c

+7 −2
Original line number Diff line number Diff line
@@ -517,9 +517,14 @@ static int process_all_tables_in_db(char *database) 
  LINT_INIT(res);

  if (use_db(database))

    return 1;

  if (mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") ||

	!((res= mysql_store_result(sock))))

  if ((mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") &&

       mysql_query(sock, "SHOW TABLES")) ||

      !(res= mysql_store_result(sock)))

  {

    my_printf_error(0, "Error: Couldn't get table list for database %s: %s",

		    MYF(0), database, mysql_error(sock));

    return 1;

  }



  num_columns= mysql_num_fields(res);

libmysqld/lib_sql.cc

+2 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ static void emb_free_embedded_thd(MYSQL *mysql) 
  thd->clear_data_list();

  thread_count--;

  thd->store_globals();

  thd->unlink();

  delete thd;

  mysql->thd=0;

}
@@ -627,6 +628,7 @@ void *create_embedded_thd(int client_flag) 
  bzero((char*) &thd->net, sizeof(thd->net));



  thread_count++;

  threads.append(thd);

  return thd;

err:

  delete(thd);

mysql-test/include/wait_condition.inc.moved

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
# include/wait_condition.inc

#

# SUMMARY

#

#    Waits until the passed statement returns true, or the operation

#    times out.

#

# USAGE

#

#    let $wait_condition=

#      SELECT c = 3 FROM t;

#    --source include/wait_condition.inc

#

#   OR

#

#    let $wait_timeout= 60; # Override default 30 seconds with 60.

#    let $wait_condition=

#      SELECT c = 3 FROM t;

#    --source include/wait_condition.inc

#    --echo Executed the test condition $wait_condition_reps times

#

# EXAMPLE

#    events_bugs.test, events_time_zone.test

#



--disable_query_log



let $wait_counter= 300;

if ($wait_timeout)

{

  let $wait_counter= `SELECT $wait_timeout * 10`;

}

# Reset $wait_timeout so that its value won't be used on subsequent

# calls, and default will be used instead.

let $wait_timeout= 0;



# Keep track of how many times the wait condition is tested

# This is used by some tests (e.g., main.status)

let $wait_condition_reps= 0;

while ($wait_counter)

{

    let $success= `$wait_condition`;

    inc $wait_condition_reps;

    if ($success)

    {

        let $wait_counter= 0;

    }

    if (!$success)

    {

        real_sleep 0.1;

        dec $wait_counter;

    }

}

if (!$success)

{

  echo Timeout in wait_condition.inc for $wait_condition;

}



--enable_query_log

mysql-test/r/create.result

+2 −2
Original line number Diff line number Diff line
@@ -1754,8 +1754,8 @@ create table t1 like information_schema.character_sets; 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',

  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',

  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',

  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',

  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',

  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'

) ENGINE=MEMORY DEFAULT CHARSET=utf8

mysql-test/r/federated.result

+9 −0
Original line number Diff line number Diff line
@@ -2130,6 +2130,15 @@ Table Checksum 
test.t1	2465757603

DROP TABLE t1;

DROP TABLE t1;

CREATE TABLE t1 (a TEXT, b TEXT, KEY(b(1)));

INSERT INTO t1 VALUES (NULL, NULL), (NULL, NULL), (NULL, NULL), (NULL, NULL);

CREATE TABLE t1

(a TEXT, b TEXT, KEY(b(1))) ENGINE=FEDERATED

CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';

SELECT t1.a FROM t1, t1 as t2 WHERE t2.b NOT LIKE t1.b;

a

DROP TABLE t1;

DROP TABLE t1;

End of 5.0 tests

create server 's1' foreign data wrapper 'mysql' options (port 3306);

drop server 's1';