identical to another in result"
According to SQL standard queries like 
"select t1.a as col from t1, t2 order by a" should return an error if
both tables contain field a.


mysql-test/r/order_by.result:
  Updated test to conform SQL-standard.
mysql-test/t/order_by.test:
  Updated test to conform SQL-standard.
sql/item.cc:
  find_item_in_list() has now one more out parameter which is not used
  in item.cc functions.
sql/mysql_priv.h:
  find_item_in_list(): Added boolean out parameter "unaliased" which
  indicates that we have found field by its original name and not by
  its alias in item (select) list.
sql/sql_base.cc:
  find_item_in_list(): Added boolean out parameter "unaliased" which
  indicates that we have found field by its original name and not by
  its alias in item (select) list. This means that additional check is
  required to ensure there will be no ambiguity if we would search for this
  field in all tables.
sql/sql_select.cc:
  find_order_in_list(): If we have found field in select list by its
  original name and not by its alias then we should perform additional
  check to ensure that there will be no ambiguity if we will search for
  this field in all tables. Also small cleanup.

prepared statements."


include/hash.h:
  New declaration for hash_reset() function. The old version was not used.
libmysql/client_settings.h:
  Declaration for mysql_detach_stmt_list().
libmysql/libmysql.c:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  add call to mysql_detach_stmt_list(prepared statements) to
  mysql_change_user(): all statements are freed by server, so client
  counterparts need to be marked as not usable.
mysys/hash.c:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  implementation of hash_reset(), which frees all hash elements
  and prepares the hash for reuse.
sql-common/client.c:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  implementation of mysql_detach_stmt_list(): zero connection pointer
  in given statement list, thus marking given statements as not usable.
sql/sql_class.cc:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  reset prepared statements map in THD::change_user().
sql/sql_class.h:
  Fix for bug#5315 "mysql_change_user() doesn't free prepared statements":
  implementation of Statement_map::reset().
  A little cleanup of ~Statement_map(): first empty names_hash, as st_hash
  has a free function, which will delete statements.
tests/client_test.c:
  A test case for bug #5315 "mysql_change_user() doesn't free prepared
  statements".

into mysql.com:/space/my/mysql-4.1

into private-client-ip-101.oz.net:/Users/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

allow blank lines in Ndb.cfg files

   label for now)
 - tagged ChangeSet 1.2015.1.10 as "mysql-4.1.5"


configure.in:
   - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma"
     label for now)

OPTIMIZE TABLE <archive table>

This recompresses the table, thus removing any additional gzip headers caused by opening/closing or flushing the table.


mysql-test/r/archive.result:
  Added optimize test case for archive engine.
mysql-test/t/archive.test:
  Added test case for OPTIMIZE table <archive table>
sql/examples/ha_archive.cc:
  The big change was the addition of optimize() call to allow tables to be recompressed (so if you have been reading/writing/reading/writing and ending up with larger files then you should, this will solve it). Though adding this feature is going to make it a real headache to add row level locking. 
  Also fixed bug reported by JD where storage engine code was not functioning (this of course was because I didn't check for the propper return value for hash_init). Removed BROKEN_GZIP ifdef since there was no way to enable it.
sql/examples/ha_archive.h:
  Added optimize() method.

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

into mysql.com:/GORDON/MySQL/mysql-4.1/src

These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible

They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.  

Make the result sets (order of rows) more predictable by using ORDER BY.


mysql-test/include/ps_modify.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/include/ps_modify1.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/r/ps_2myisam.result:
  updated results
mysql-test/r/ps_3innodb.result:
  updated results
mysql-test/r/ps_4heap.result:
  updated results
mysql-test/r/ps_5merge.result:
  updated results
mysql-test/r/ps_6bdb.result:
  updated results
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Merge fixes


mysql-test/r/ndb_insert.result:
  Correct test cases and result after merge
mysql-test/t/ndb_insert.test:
  Correct test cases and result after merge
sql/ha_ndbcluster.cc:
  Correct get_error_message after merge
  Use buf pointer in get_ndb_value

uninit variable


ndb/src/kernel/vm/Configuration.cpp:
  init variable

into mysql.com:/home/jonas/src/mysql-4.1

sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_insert.result:
  Merge new test cases
mysql-test/t/ndb_insert.test:
  Merge new test cases

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

key Column Fails".


mysql-test/r/ps.result:
  Test results updated: a test case for Bug#5510 "inserting Null in 
  AutoIncrement primary key Column Fails".
mysql-test/r/ps_2myisam.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_3innodb.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_4heap.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_5merge.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_6bdb.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/t/ps.test:
  A test case for Bug#5510 "inserting Null in AutoIncrement primary key Column 
  Fails".
sql/item.cc:
  A fix for bug#5510 "inserting Null in AutoIncrement primary key Column 
  Fails": use proper Field API function for NULL placholeders.

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.


mysql-test/t/ps.test:
  A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result
  with a fixed constant to pass on QNX:
  max_data_file_length is calculated depending on max value of record
  pointer. It's different on QNX, so the result difference is intentional.

into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-update-4.1


sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

acinclude.m4:
  Uncommented zlib library message checking for Netware.
netware/init_db.sql:
  Applied a patch for Netware.
netware/test_db.sql:
  Applied a patch for Netware.

into gw.mysql.r18.ru:/usr/home/ram/work/4.1

into gw.mysql.r18.ru:/usr/home/ram/work/4.1

mysql-test/r/func_compress.result:
  clean-up. The length of compress() may depend on zlib version, etc.
mysql-test/t/func_compress.test:
  clean-up. The length of compress() may depend on zlib version, etc.

of EXPLAIN SELECT, rather than binary strings.

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

set a printout in SocketClient only for debug


ndb/src/common/util/SocketClient.cpp:
  set a printout only for debug
scripts/mysql_install_db.sh:
  mysql_install_db should do skip-ndbcluster

ndb/src/ndbapi/Ndblist.cpp:
  Add theNoOfDBnodes to DBUG_PRINT

ndb/src/ndbapi/Ndblist.cpp:
  Added DBUG_PRINT's etc to checkFailedNode

  Slightly improved the fix for bug #5406.


sql/opt_sum.cc:
  Slightly improved the fix for bug #5406.

  Bug #5561 No BINARY_FLAG in metadata


sql/item.cc:
  Bug #5561 No BINARY_FLAG in metadata

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged