Changed test case from GRANT to CREATE USER


mysql-test/r/partition_mgm.result:
  Bug#32091: Security breach via directory changes
  test result
mysql-test/t/partition_mgm.test:
  Bug#32091: Security breach via directory changes
  Changed test case from GRANT to CREATE USER

small fix of test case (when running make test after
merge, it did not substitute MYSQLTEST_VARDIR in
the error)


mysql-test/r/partition_mgm.result:
  Bug#32091: Security breach via directory changes
  small fix in test result
mysql-test/t/partition_mgm.test:
  Bug#32091: Security breach via directory changes
  small fix in test case

Problem: the table's INDEX and DATA DIR was taken
  directly from the table's first partition.
  This allowed rename attack similar to
  bug#32111 when ALTER TABLE REMOVE PARTITIONING

Solution: Silently ignore the INDEX/DATA DIR
  for the table. (Like some other storage engines
  do). 
  Partitioned tables do not support DATA/INDEX
  DIR on the table level, only on its partitions.


mysql-test/r/partition_mgm.result:
  Bug#32091: Security breach via directory changes
  test result
mysql-test/t/partition_mgm.test:
  Bug#32091: Security breach via directory changes
  test case
sql/ha_partition.cc:
  Bug#32091: Security breach via directory changes
  
  Do not use the first partition's DATA/INDEX DIR
  as the table's DATA/INDEX DIR.
  (A partitioned table do not have support for DATA/
  INDEX DIR, only its partitions do)

Fixed absurd compiler warnings of a Suse 10.1 system.

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

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-4.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


sql/item_func.cc:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/item_func.cc:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-5.1-engines


mysql-test/t/fulltext.test:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/fulltext.result:
  SCCS merged

into  stella.local:/home2/mydev/mysql-5.0-axmrg


BitKeeper/deleted/.del-disabled.def:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.0-axmrg


sql/item_func.cc:
  Auto merged

Preliminarily disabled test case

Typo --#echo at line begin in test files lead to warnings
from mysqltest.
  
Changed to --echo #.


mysql-test/include/mix1.inc:
  Bug#32048 - innodb_mysql.test produces warnings files
  Fixed comment sign
mysql-test/r/innodb_mysql.result:
  Bug#32048 - innodb_mysql.test produces warnings files
  Fixed test result

into  mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-5.0-engines


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
myisam/ft_boolean_search.c:
  Use local.

into  stella.local:/home2/mydev/mysql-4.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/variables.test:
  Manual merge from 5.0

into  stella.local:/home2/mydev/mysql-5.0-axmrg

Comment sign of -- at line begin in test files lead to warnings
from mysqltest.

Changed -- to #.


mysql-test/include/gis_keys.inc:
  Bug#31909 - New gis.test creates warnings files
  Changed -- to # at comment begin to avoid warnings files.

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_func.cc:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_func.cc:
  Auto merged

into  mysql.com:/home/kent/bk/bug24809/mysql-5.1-build


cmd-line-utils/libedit/Makefile.am:
  Auto merged

into  stella.local:/home2/mydev/mysql-4.1-axmrg

  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)


cmd-line-utils/libedit/Makefile.am:
  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)

1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".


Makefile.am:
  Add a new "make" target "embedded-test" so that it is easier 
  to test the "embedded server" ("libmyslqd").
  Make it "phony".
  
  Use it via a sub-make within "test-bt" to avoid code duplication.
netware/Makefile.am:
  Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug30296.1-merge-5.1

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


mysql-test/mysql-test-run.pl:
  Auto merged