Commit 092b8f9e authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.1-opt 

into  mysql.com:/home/hf/work/mysql-5.1-mrg


BitKeeper/deleted/.del-bdb-deadlock.test:
  Auto merged
Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/deadlock.inc:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
client/mysqltest.c:
  merging
include/my_time.h:
  merging
libmysql/libmysql.c:
  merging
mysql-test/t/order_by.test:
  merging
sql/sql_yacc.yy:
  merging
parents 45989298 bbc5d138

Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ test-force: 
test-force-full:

	$(MAKE) force=--force test-full



#used by autopush.pl to run memory based tests

test-force-mem:

	$(MAKE) 'force=--force --mem' test



# Keep these for a while

test-pl:	test

test-full-pl:	test-full

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ void handle_no_error(struct st_command*); 
  by mysql_send_query. It's technically possible, though

  i don't see where it is needed.

*/

pthread_handler_decl(send_one_query, arg)

pthread_handler_t send_one_query(void *arg)

{

  struct st_connection *cn= (struct st_connection*)arg;
@@ -4574,8 +4574,8 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, 
                      int flags, char *query, int query_len,

                      DYNAMIC_STRING *ds, DYNAMIC_STRING *ds_warnings)

{

  MYSQL *mysql= &cn->mysql;

  MYSQL_RES *res= 0;

  MYSQL *mysql= &cn->mysql;

  int err= 0, counter= 0;

  DBUG_ENTER("run_query_normal");

  DBUG_PRINT("enter",("flags: %d", flags));

include/my_time.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ typedef long my_time_t; 
#define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + \

                        TIME_MAX_SECOND)



my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,

                   ulong flags, int *was_cut);

enum enum_mysql_timestamp_type

str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,

                uint flags, int *was_cut);

libmysql/libmysql.c

+0 −8
Original line number Diff line number Diff line
@@ -4763,14 +4763,6 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) 
    DBUG_RETURN(1);

  }



  if (result->data)

  {

    free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));

    result->data= NULL;

    result->rows= 0;

    stmt->data_cursor= NULL;

  }



  if (stmt->update_max_length && !stmt->bind_result_done)

  {

    /*

mysql-test/r/func_group.result

+26 −0
Original line number Diff line number Diff line
@@ -1020,3 +1020,29 @@ t1 CREATE TABLE `t1` ( 
  `stddev(0)` double(8,4) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

CREATE TABLE t1 (a INT, b INT);

INSERT INTO t1 VALUES (1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8);

INSERT INTO t1 SELECT a, b+8       FROM t1;

INSERT INTO t1 SELECT a, b+16      FROM t1;

INSERT INTO t1 SELECT a, b+32      FROM t1;

INSERT INTO t1 SELECT a, b+64      FROM t1;

INSERT INTO t1 SELECT a, b+128     FROM t1;

INSERT INTO t1 SELECT a, b+256     FROM t1;

INSERT INTO t1 SELECT a, b+512     FROM t1;

INSERT INTO t1 SELECT a, b+1024    FROM t1;

INSERT INTO t1 SELECT a, b+2048    FROM t1;

INSERT INTO t1 SELECT a, b+4096    FROM t1;

INSERT INTO t1 SELECT a, b+8192    FROM t1;

INSERT INTO t1 SELECT a, b+16384   FROM t1;

INSERT INTO t1 SELECT a, b+32768   FROM t1;

SELECT a,COUNT(DISTINCT b) AS cnt FROM t1 GROUP BY a HAVING cnt > 50;

a	cnt

1	65536

SELECT a,SUM(DISTINCT b) AS sumation FROM t1 GROUP BY a HAVING sumation > 50;

a	sumation

1	2147516416

SELECT a,AVG(DISTINCT b) AS average FROM t1 GROUP BY a HAVING average > 50;

a	average

1	32768.5000

DROP TABLE t1;

End of 5.0 tests