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

into  selena.:H:/MYSQL/src/#13377-mysql-5.0a

Code that closes current relay log is moved to purge_relay_logs().

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

Added back missing return in mysql_delete()


mysql-test/my_manage.c:
  Cleanup: Remove some #ifdef
mysql-test/r/drop_temp_table.result:
  Delete database that may be left from other test
mysql-test/t/drop_temp_table.test:
  Delete database that may be left from other test
sql/log.cc:
  false -> FALSE
  true -> TRUE
  Wait until readers_count is 0 (not just for a signal)
  
  NOTE: it's very likely that the way to handle readers_count is wrong.
  (We are in pthread_cond_wait freeing a mutex that is not the innermost mutex,
  which can lead to deadlocks)
  
  I will talk with Guilhem about this ASAP
sql/log_event.h:
  Remove number from last even to help future merges
  (all compilers I know of can handle this properly)
sql/sql_delete.cc:
  Add back missing RETURN (was lost in a merge)
  Indentation fixes

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

server-tools/instance-manager/listener.cc:
  reinitialize timer used in select(), as on linux it is modified
  to reflect amout of time not slept (e.g. set ot zero)

into  mysql.com:/usr/home/ram/work/5.0.b14290

into  mysql.com:/space/pekka/ndb/version/my50

ndb/test/src/HugoCalculator.cpp:
  does not use Base64.hpp which was renamed to base64.h

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

into  mysql.com:/usr/home/ram/work/5.0.b14290

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

server-tools/instance-manager/manager.cc:
  Additional comment for the bugfix

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

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


mysql-test/std_data/loaddata_dq.dat:
  Merge rename: mysql-test/std_data/loaddata5.dat -> mysql-test/std_data/loaddata_dq.dat
sql/item.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  Resolve conflicts, deal with renamed dat file
mysql-test/t/loaddata.test:
  Resolve conflicts, deal with renamed dat file

Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.


mysql-test/include/gis_generic.inc:
  Change in test for NDB (needs order by)
mysql-test/r/archive.result:
  Change for gis_generic
mysql-test/r/archive_gis.result:
  Change in test gis_generic
mysql-test/r/bdb_gis.result:
  Change in gis test means new results
mysql-test/r/innodb_gis.result:
  Change in gis test means change in results.
mysql-test/r/ndb_gis.result:
  Change in gis means result change
mysql-test/t/archive.test:
  Added alter table test to fix bug in alter table
mysql-test/t/archive_gis.test:
  Change in syntax
mysql-test/t/ndb_gis.test:
  Change to test both with and not with pushdown conditions
sql/ha_archive.cc:
  Removed ARN temp file from exts[] to solve warning messages in alter table.

into  zim.(none):/home/brian/mysql/mysql-5.0

into  selena.:H:/MYSQL/src/#14137-mysql-5.0


sql/mysqld.cc:
  Auto merged

into  big_geek.:C:/Work/mysql/mysql-5.0

Bug#12166 - Unable to index very large tables
Moved clearing of errors behind the second repair attempt,
but will clear only if no error happened.

No test case. The error can be repeated with little free
space on tmpdir only. I do not know of a way to create this
in a portable way with our test suite.

I did however attach a shell script to the bug report which
can easily be adapted to the situation on the test machine.


myisam/mi_check.c:
  Bug#12166 - Unable to index very large tables
  Changed comments.
  Removed unnecessary use of param->keys_in_use.
sql/ha_myisam.cc:
  Bug#12166 - Unable to index very large tables
  Moved clearing of errors behind the second repair attempt,
  but will clear only if no error happened.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

another macro defined in the Windows header files.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

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

into  zim.(none):/home/brian/mysql/mysql-5.0

into  asksasha.com:/reiser-data/mysql-dev/mysql-5.0-bug12974

into mysql.com:/data0/mysqldev/patg/mysql-5.0-viewfix

mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.


client/mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.
mysql-test/t/mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysql-test/r/mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views

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


sql/sql_yacc.yy:
  Auto merged

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


sql/item_func.cc:
  Auto merged

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


sql/sql_parse.cc:
  Auto merged

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

into  zim.(none):/home/acurtis/mysql-5.0-noraid.2


sql/sql_yacc.yy:
  Auto merged

into  zim.(none):/home/brian/mysql/mysql-5.0

server-tools/instance-manager/instance.cc:
  terminate the new line buffer so our strcat's will work

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


sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/sql_show.cc:
  Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.
  adjust CHARACTER_MAXIMUM_LENGTH value for text fields.