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

into mysql.com:/home/psergey/mysql-5.0-bug9912

into mysql.com:/space/my/mysql-5.0-build

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


libmysql/libmysql.c:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

into deer.(none):/home/hf/work/mysql-5.0.clean

mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_cache.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

sql/share/Makefile.am:
  Auto merged
tools/Makefile.am:
  Auto merged

into mysql.com:/home/mydev/mysql-5.0-5000


ndb/test/ndbapi/Makefile.am:
  Auto merged

into deer.(none):/home/hf/work/mysql-4.1.7344

One more free_charset call added


libmysql/libmysql.c:
  free_charset call added

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


ndb/test/ndbapi/Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


sql/sql_select.cc:
  Auto merged

* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with 
  'index' scan.


mysql-test/r/range.result:
  Update the test result after the changed cost
sql/opt_range.cc:
  Fix for BUG#10037
  * Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with 
    'index' scan.
  * make QUICK_GROUP_MIN_MAX_SELECT handle the case where the source table is empty.

into mysql.com:/home/mydev/mysql-5.0-5000


ndb/test/ndbapi/Makefile.am:
  Auto merged

into mysql.com:/home/pem/work/mysql-5.0

  by simply disallowing alter procedure/function in an SP (as for drop).


mysql-test/r/sp-error.result:
  Added test case for BUG#7047.
mysql-test/t/sp-error.test:
  Added test case for BUG#7047.
sql/share/errmsg.txt:
  Modified error message for "update procedure/function" too.
sql/sql_yacc.yy:
  Don't allow alter procedure/function in an SP.

ndb/src/ndbapi/TransporterFacade.cpp:
  dbug aid for api signal log

mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
sql/table.h:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Using local 5.0 version.
sql/mysql_priv.h:
  Merged.
sql/sql_insert.cc:
  Merge needs fixes.

  Bug in the optimizer caused an infinite loop for weird code.


mysql-test/r/sp.result:
  New test case for BUG#6898.
mysql-test/t/sp.test:
  New test case for BUG#6898.
sql/sp_head.cc:
  Detect self referencing jumps in the optimizer.

into mysql.com:/home/mydev/mysql-4.1-bug7806

into mysql.com:/home/mydev/mysql-4.1-bug7806

ndb/test/ndbapi/Makefile.am:
  Manual merge

cmd-line-utils/readline/config_readline.h:
  Fixing code formatting

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

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Removed forgotten abort() call

into mysql.com:/home/psergey/mysql-4.1-bug9103

sql/sql_select.h:
  Auto merged

mysql-test/r/olap.result:
  Auto merged
mysql-test/t/olap.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

  Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
olap.result, olap.test:
  Added a test case for bug #9681.


mysql-test/t/olap.test:
  Added a test case for bug #9681.
mysql-test/r/olap.result:
  Added a test case for bug #9681.
sql/sql_select.cc:
  Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.

sql/share/Makefile.am:
  Auto merged