Commit bdddd8c0 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Resolve conflicts
sql/ha_innodb.cc:
  Resolve conflicts
sql/item_strfunc.cc:
  Resolve conflicts
parents c6b54efe 92e2b9ed

include/my_alloc.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ typedef struct st_mem_root 
  unsigned int block_num;          /* allocated blocks counter */

  /* 

     first free block in queue test counter (if it exceed 

     MAX_BLOCK_USAGE_BEFORE_DROP block will be droped in 'used' list)

     MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list)

  */

  unsigned int first_block_usage;

mysql-test/r/func_gconcat.result

+3 −0
Original line number Diff line number Diff line
@@ -555,3 +555,6 @@ FROM t1 JOIN t2 ON t1.bID = t2.bID; 
COUNT(*)	GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')

2	test

DROP TABLE t1,t2;

select * from (select group_concat('c') from DUAL) t;

group_concat('c')

NULL

mysql-test/t/func_gconcat.test

+5 −0
Original line number Diff line number Diff line
@@ -350,4 +350,9 @@ SELECT COUNT(*), GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |') 


DROP TABLE t1,t2;



#

# Bug #12861 hang with group_concat insubquery FROM DUAL

#

select * from (select group_concat('c') from DUAL) t;



# End of 4.1 tests

mysql-test/t/rpl000009.test

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ drop database mysqltest2; 
save_master_pos;

connection slave;

sync_with_master;

# These has to be droped on slave as they are not replicated

# These have to be dropped on slave because they are not replicated

drop database mysqltest2;

drop database mysqltest3;

mysql-test/t/system_mysql_db_fix.test

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ DROP TABLE db, host, user, func, tables_priv, columns_priv, procs_priv, help_cat 


-- enable_query_log



# check that we droped all system tables

# check that we dropped all system tables

show tables;



# End of 4.1 tests