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


mysql-test/r/mysqldump-max.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged

mysql-test/r/mysqldump-max.result:
  Update test result after fix of spelling error
mysql-test/r/rpl_trigger.result:
  Update test result after fix of spelling error
mysql-test/r/type_newdecimal.result:
  Update test result after fix of spelling error
mysql-test/t/mysqldump-max.test:
  Fix spelling error "disable_warnings"
  Write shorter "drop table..."
mysql-test/t/rpl_trigger.test:
  Fix spelling error, there is no --ignore_warnings
mysql-test/t/type_newdecimal.test:
  Fix spelling error

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

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


client/mysqldump.c:
  Auto merged
sql/sql_show.cc:
  Auto merged
configure.in:
  Manual merge, the filesed of Makfile.in has been removed but needed to
  add it back in to convert .la libs to .a libs

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

to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag


configure.in:
  Replace references to yassl .la libraries with direct reference to
  the .a libraries
netware/BUILD/mwldnlm:
  Add comment about why mwldnlm is called with the "x" flag and how
  to avoid it

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


include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
vio/viossl.c:
  Auto merged
vio/viosslfactories.c:
  Auto merged
netware/BUILD/mwenv:
  Merge

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

netware/BUILD/compile-netware-END:
  If running as user pushbuild don't run autotools again
netware/BUILD/mwenv:
  Set ARFLAGS to value of AR_FLAGS

vio/viossl.c:
  No need for special code to switch from WinSock to BSD sockets when using yaSSL
vio/viosslfactories.c:
  The OpenSSL port to NetWare has added some extra functions to free up memory, no need
  to call them when using yaSSL

This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"


mysql-test/mysql-test-run.pl:
  Avoid matching the trailing carriage return when parsing the mysqld.spec file

The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value.

into  example.com:/work/bug23037/my51

into  example.com:/work/bug23037/my50


sql/sql_show.cc:
  Auto merged

into  example.com:/work/bug23037/my51


sql/sql_show.cc:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge

  
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.


mysql-test/r/information_schema.result:
  Update result
  
  Because the length of I_S.COLUMNS.COLUMN_DEFAULT was increased to
  65535 the column changed it's type from varchar(64) to longtext
  The type is longtext if the length is > 65532 (the max varchar len)
mysql-test/t/information_schema.test:
  test case for bug#23037: Bug in field "Default" of
  query "SHOW COLUMNS FROM table"
  
  Both SHOW COLUMNS and I_S.COLUMNS is TESTED as well the
  value returned by both. Using --replace_regex is unfeasible
  as the repetition value cannot be > 255.
  --replace_regex /A{256}/VALUE/ doesn't work, not to talk about
    /A{65532}/VALUE/
  /(A{255}){255}/VALUE/ is awfully slow. Thus, simple function with
  cursor is used to extract the value.
sql/sql_show.cc:
  Default value can have TIMESTAMP, CHAR, VARCHAR, ENUM
  VARCHAR can have the longest value, up to 65535. However, because
  of table handler limitations the actual limit is 65532 characters,
  latin1 charset. However, here is used MAX_FIELD_VARCHARLENGTH macro,
  because there could be a storage engine without such limitation.

When looking for libc the path need to be converted from wine to unix format before test that directory exists

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


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

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

mysql-test/mysql-test-run.pl:
  If "var" is a symlink which does not point to anything, remove it

As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for 
their binaries in a separate function and produce test casea failures for the test thet needs these components

into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732

into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732

into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732

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


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/rpl_000015.result:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/r/rpl_err_ignoredtable.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_stm_log.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_drop_db.test:
  Auto merged
mysql-test/t/rpl_err_ignoredtable.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_stm_log-master.opt:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_class.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732

into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732

into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732

into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732


mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  manual merging.

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

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

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


sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  ur