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

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

into  chilla.local:/home/mydev/mysql-5.1-axmrg


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged
parents 4df381fd 13390deb

dbug/dbug.c

+14 −0
Original line number Diff line number Diff line
@@ -2375,4 +2375,18 @@ va_list ap; 


#endif  /* NO_VARARGS */



#else



/*

 * Dummy function, workaround for MySQL bug#14420 related

 * build failure on a platform where linking with an empty

 * archive fails.

 *

 * This block can be removed as soon as a fix for bug#14420

 * is implemented.

 */

int i_am_a_dummy_function() {

       return 0;

}



#endif

dbug/factorial.c

+12 −2
Original line number Diff line number Diff line 
#ifdef DBUG_OFF				/* We are testing dbug */

#undef DBUG_OFF

#endif



int factorial(register int value) {

	if(value > 1) {

		value *= factorial(value-1);

	}

	return value;

}



#else



#include <my_global.h>
@@ -15,3 +22,6 @@ register int value) 
    DBUG_PRINT ("result", ("result is %d", value));

    DBUG_RETURN (value);

}



#endif

libmysqld/lib_sql.cc

+6 −1
Original line number Diff line number Diff line
@@ -538,6 +538,11 @@ int init_embedded_server(int argc, char **argv, char **groups) 
      sql_print_error("Warning: Can't create thread to manage maintenance");

  }



  // FIXME initialize binlog_filter and rpl_filter if not already done

  //       corresponding delete is in clean_up()

  if(!binlog_filter) binlog_filter = new Rpl_filter;

  if(!rpl_filter) rpl_filter = new Rpl_filter;



  if (opt_init_file)

  {

    if (read_init_file(opt_init_file))
@@ -593,7 +598,7 @@ void *create_embedded_thd(int client_flag) 
  thd->set_time();

  thd->init_for_queries();

  thd->client_capabilities= client_flag;

  thd->real_id= (pthread_t) thd;

  thd->real_id= pthread_self();



  thd->db= NULL;

  thd->db_length= 0;

mysql-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ CLEANFILES = $(GENSCRIPTS) 


INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..





dist-hook:

	mkdir -p \

		$(distdir)/t \

mysql-test/r/distinct.result

+25 −1
Original line number Diff line number Diff line
@@ -530,7 +530,8 @@ id select_type table type possible_keys key key_len ref rows Extra 
EXPLAIN SELECT DISTINCT a,b FROM t1 GROUP BY a,b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	

CREATE TABLE t2(a INT, b INT, c INT, d INT, PRIMARY KEY (a,b));

CREATE TABLE t2(a INT, b INT NOT NULL, c INT NOT NULL, d INT, 

PRIMARY KEY (a,b));

INSERT INTO t2 VALUES (1,1,1,50), (1,2,3,40), (2,1,3,4);

EXPLAIN SELECT DISTINCT a FROM t2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -644,3 +645,26 @@ SELECT COUNT(*) FROM 
COUNT(*)

2

DROP TABLE t1, t2;

CREATE TABLE t1 (a INT, UNIQUE (a));

INSERT INTO t1 VALUES (4),(null),(2),(1),(null),(3);

EXPLAIN SELECT DISTINCT a FROM t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	a	5	NULL	6	Using index

SELECT DISTINCT a FROM t1;

a

NULL

1

2

3

4

EXPLAIN SELECT a FROM t1 GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	a	5	NULL	6	Using index

SELECT a FROM t1 GROUP BY a;

a

NULL

1

2

3

4

DROP TABLE t1;