into  lamia.home:/home/timka/mysql/src/4.1-bug-21787


sql/sql_select.cc:
  Auto merged

  
The problem was due to a prior fix for BUG 9676, which limited
the rows stored in a temporary table to the LIMIT clause. This
optimization is not applicable to non-group queries with aggregate
functions. The fix disables the optimization in this case.


mysql-test/r/limit.result:
  Test case for BUG#21787
mysql-test/t/limit.test:
  Test case for BUG#21787
sql/sql_select.cc:
  If there is an aggregate function in a non-group query,
  materialize all rows in the temporary table no matter if
  there is a LIMIT clause. This is necessary, since the
  aggregate functions must be computed over all result rows,
  not just the first LIMIT rows.

 - Dont test "encrypt" in ctype_ucs


mysql-test/r/ctype_ucs.result:
  Don't test "encrypt" function in ctype_ucs.test
mysql-test/t/ctype_ucs.test:
  Don't test "encrypt" function in ctype_ucs.test

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

BitKeeper/etc/ignore:
  Added mysql-test/mtr to the ignore list

into  rama.(none):/home/jimw/my/mysql-4.1-21288

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


tests/mysql_client_test.c:
  Auto merged

single file is a bad practice.  


tests/mysql_client_test.c:
  Replace literal characters which don't make sense in UTF8 with ubiquitously-
  understood numbers.

into  maint2.mysql.com:/data/localhome/tsmith/bk/41

into  maint2.mysql.com:/data/localhome/tsmith/bk/41


BUILD/SETUP.sh:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053


mysys/my_read.c:
  Auto merged

	event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.


mysys/my_read.c:
  The read() syscall should check for negative one, since that (usually) signals
  errors (like being interrupted) and zero (usually) signals end-of-file .

into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41


BUILD/SETUP.sh:
  SCCS merged

Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte


include/mysql_com.h:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  added new constants NAME_BYTE_LEN, USERNAME_BYTE_LENGTH, SYSTEM_CHARSET_MBMAXLEN
mysql-test/r/ctype_utf8.result:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  test case
mysql-test/t/ctype_utf8.test:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  test case
sql-common/client.c:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  increased buffers for user name & db
sql/sql_acl.cc:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  check that user name is not longer than USERNAME_LENGTH symbols
sql/sql_parse.cc:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  increased buffers for user name & db
sql/table.cc:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  check that db name is not longer than NAME_LEN symbols

into  maint2.mysql.com:/data/localhome/tsmith/bk/41

into  maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41


BUILD/SETUP.sh:
  SCCS merged

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

Null merge to 5.0


mysql-test/mysql-test-run.pl:
  Ignore --skip-im if specified on command line

mysql-test/lib/mtr_cases.pl:
  Detect which tests that need ndb
mysql-test/lib/mtr_match.pl:
  Add function mtr_match_substring
mysql-test/mysql-test-run.pl:
  Only start cluster for test cases that need it

Default is "var/tmp" 


mysql-test/r/myisam.result:
  Update result file
mysql-test/t/myisam.test:
  If running test suite with a non standard tmp dir, the "show create table" will print "DATA DIRECTORY="
  Use replace_result to mask it out
  Set tmpdir to var/log to get the printout of DATA DIRECTORY also when running with standard tmpdir

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

mysql-test/lib/mtr_misc.pl:
  On windows the exe does not need to be executable for it to be found

mysql-test/r/subselect.result:
  BUG#16255: A proper testcase
mysql-test/t/subselect.test:
  BUG#16255: A proper testcase

 Must not use Item_direct_ref in HAVING because it points to
 the new value (witch is not yet calculated for the first row).


mysql-test/r/subselect.result:
  Bug #16255: Subquery in where
   - test case
mysql-test/t/subselect.test:
  Bug #16255: Subquery in where
   - test case
sql/item_subselect.cc:
  Bug #16255: Subquery in where
   Must not use Item_direct_ref in HAVING because it points to
   the new value (witch is not yet calculated for the first row).

into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint


support-files/mysql.spec.sh:
  Auto merged

into  maint1.mysql.com:/data/localhome/tsmith/bk/41

into  siva.hindu.god:/usr/home/tim/m/bk/41


sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors


mysql-test/r/func_misc.result:
  Test EXPORT_SET() with charset coersion (bug #21531)
mysql-test/t/func_misc.test:
  Test EXPORT_SET() with charset coersion (bug #21531)
sql/item_func.h:
  Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors.
sql/item_strfunc.cc:
  Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail.

into  siva.hindu.god:/usr/home/tim/m/bk/41


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).

Also, convert an sql_print_error -> sql_print_information for a non-error server event.


sql/slave.cc:
  Change sql_print_error to sql_print_information for non-error status message.
sql/sql_acl.cc:
  Remove sql_print_error calls for events which are not server errors

into  maint1.mysql.com:/data/localhome/tsmith/bk/41

into  lamia.home:/home/timka/mysql/src/4.1-bug-21456


sql/sql_select.cc:
  Auto merged

GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
optimization because ORDER BY may be removed when GROUP BY/DISTINCT
sorts as a side effect, e.g. in 
  SELECT DISTINCT <non-key-col>,<pk> FROM t1
  ORDER BY <non-key-col> DISTINCT
must be removed before ORDER BY as if done the other way around
it will remove both.


mysql-test/r/distinct.result:
  Test for BUG#21456.
mysql-test/t/distinct.test:
  Test for BUG#21456.
sql/sql_select.cc:
  Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by
  
  GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
  optimization because ORDER BY may be removed when GROUP BY/DISTINCT
  sorts as a side effect.