myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged

  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.


sql/sql_class.h:
  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
sql/sql_select.cc:
  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.

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

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


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

  required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.

into  mysql.com:/home/svoj/devel/mysql/BUG12075/mysql-4.1

FULLTEXT non-functional for big5 strings


mysql-test/r/ctype_big5.result:
  Test case for BUG#12075.
mysql-test/t/ctype_big5.test:
  Test case for BUG#12075.
strings/ctype-big5.c:
  hack: (to be fixed properly later) all multi-byte sequences are considered isalpha() now

into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1


myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Manual merge.
mysql-test/t/fulltext.test:
  Manual merge.

Repair crashes mysql when table has fulltext index.


myisam/sort.c:
  Use static ft_buf instead of dynamic mergebuf. Latter could be NULL if record has long words.
mysql-test/r/fulltext.result:
  Test case for BUG#11684 - repair crashes mysql when table has fulltext index.
mysql-test/t/fulltext.test:
  Test case for BUG#11684 - repair crashes mysql when table has fulltext index.

mysql-test/r/func_math.result:
  Fix incorrect merge of test results
mysql-test/r/user_var.result:
  Fix incorrect merge

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


mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/func_math.result:
  Resolve conflicts
mysql-test/r/user_var.result:
  Resolve conflicts
mysql-test/t/func_math.test:
  Resolve conflicts
mysql-test/t/user_var.test:
  Resolve conflicts
sql/item_func.cc:
  Resolve conflicts
sql/sql_parse.cc:
  Resolve conflicts

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


sql/sql_parse.cc:
  Auto merged

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


sql/item_func.cc:
  Auto merged
mysql-test/t/func_math.test:
  Resolve conflict

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


sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/user_var.test:
  Resolve conflict

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


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

conflict in a unique key. (Bug #12226)


mysql-test/r/delayed.result:
  Add results
mysql-test/t/delayed.test:
  Add new regression test
sql/sql_insert.cc:
  Fix crash in error handling of 'INSERT DELAYED' statement

cleanup.


sql/sp_head.cc:
  Remove unused variable and always add sql_mode to fields in
  sp_head::show_create_function().

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1

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

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


sql/ha_ndbcluster.cc:
  Auto merged

into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0


sql/sql_select.cc:
  Auto merged

Review of new pushed code


client/mysqlbinlog.cc:
  After merge fixes
sql/set_var.cc:
  After merge fixes
sql/sql_select.cc:
  Removed not needed test (field->maybe_null() also tests field->table->maybe_null)

into  mishka.local:/home/my/mysql-5.0


sql/sql_select.cc:
  Auto merged

into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0


sql/sql_select.cc:
  Auto merged

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

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


mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged

  Modified test case for bug #12144.


mysql-test/t/null_key.test:
  Modified test case for bug #12144.
mysql-test/r/null_key.result:
  Modified test case for bug #12144.

into  mishka.local:/home/my/mysql-5.0


mysql-test/t/sp.test:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
client/client_priv.h:
  Simple merge
client/mysqldump.c:
  Simple merge
mysql-test/r/variables.result:
  Simple merge
mysql-test/t/variables.test:
  Simple merge
sql/sql_trigger.cc:
  Simple merge

Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.


client/client_priv.h:
  Added OPT_TRIGGERS (to get rid of compiler warning)
client/mysql.cc:
  Added cast to get rid of compiler warning
client/mysqldump.c:
  Added OPT_TRIGGERS (to get rid of compiler warning)
  Abort if we can't write to outfile (even if --ignore-errors is given)
client/mysqltest.c:
  Added --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
include/my_sys.h:
  Make my_progname const
include/my_time.h:
  Avoid using 'bool' in C programs
mysql-test/lib/init_db.sql:
  Align with mysql_create_system_tables
  (Ideally this file should be auto-generated from the above script)
mysql-test/r/mysqltest.result:
  Test for --enable_parsing
mysql-test/r/variables.result:
  Update results after fix for overflow checking of max_heap_table_size
mysql-test/t/information_schema.test:
  USe --enable/disable parsing instead of comments
mysql-test/t/mysqltest.test:
  Test for --enable_parsing
mysql-test/t/sp.test:
  USe --enable/disable parsing instead of comments
mysql-test/t/variables.test:
  Portability fix for 64 bit systems
mysql-test/t/view.test:
  USe --enable/disable parsing instead of comments
mysys/my_init.c:
  May my_progname const
mysys/my_static.c:
  May my_progname const
mysys/thr_lock.c:
  Remove not needed casts
sql-common/my_time.c:
  Change bool -> my_bool as bool is not portable in C programs
sql/field.cc:
  Test number_to_datetime() for -1 instead of < 0 (Safety fix)
  New prototype for TIME_to_timestamp()
sql/item.h:
  Don't have prototypes for both uint32 and ulong as these 'may' be the same thing
sql/item_timefunc.cc:
  New prototype for TIME_to_timestamp()
sql/log.cc:
  Remove compiler warnings
sql/mysql_priv.h:
  New prototype for TIME_to_timestamp()
  Added function for comparing LEX_STRING
sql/set_var.cc:
  Added overflow checking when setting ulong variable
sql/sql_base.cc:
  Added function is_equal()
  Changed strncmp -> is_equal() as strncmp() to not match "V" (instead of "VIEW")
sql/sql_class.cc:
  Added comment
sql/sql_select.cc:
  Portability fixes
  After review fixes
sql/sql_trigger.cc:
  Use 'tables_alias_charset' for comparing database name
  Use 'is_equal()' to compare file type. (Old code didn't do the comparison correctly)
sql/sql_view.cc:
  Use 'is_equal()' to compare file type. (Old code didn't do the comparison correctly)
sql/time.cc:
  New prototype for TIME_to_timestamp() to allow easyer mapping to C function
sql/tztime.cc:
  bool -> my_bool (to allow calling C code from C++ code)
sql/tztime.h:
  bool -> my_bool (to allow calling C code from C++ code)

VC++Files/client/mysqlclient_ia64.dsp:
  Auto merged
include/config-win.h:
  Auto merged
sql/item_sum.cc:
  SCCS merged

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

If GROUP_CONCAT is calculated we always put its argument into a temp
table, even when the argument is a constant item.

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

into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0

to connect


mysql-test/r/rpl_slave_status.result:
  updated result
mysql-test/t/rpl_slave_status.test:
  user vertical result
sql/slave.cc:
  reversed an unnecessary change for BUG#10780
sql/slave.h:
  reversed an unnecessary change for BUG#10780

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0