into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config


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

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  manual merge

Visual Studio builds each configuration in a different sub-directory.  Only the sub-
directories for release and debug are currently searched.


mysql-test/lib/mtr_misc.pl:
  Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
  - Added usage comments.
mysql-test/mysql-test-run.pl:
  Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations
  - Moved Initial_Setup function to the command_line_setup function.
  - Defined new argument vs-config which can be used to inidicate the VS Configuration
  used to create the test executables. Argument can also be controlled with
  MTR_VS_CONFIG environment variable.

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


sql/sql_show.cc:
  Auto merged

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


sql/sql_show.cc:
  Auto merged

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

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


sql/sql_delete.cc:
  Auto merged

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


sql/sql_delete.cc:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/mysqld.cc:
  Manual merge
storage/myisam/sort.c:
  Manual merge

It's not possible to flush the global status variables in 5.0
Update test case so it works by recording the value of handle_rollback
before and compare it to the value after


mysql-test/r/innodb_mysql.result:
  Update result file
mysql-test/t/innodb_mysql.test:
  It's not possible to reset the global status variables in 5.0 so intead its value
  is recorded and compared to the after value.
  It should not have changed.
sql/mysqld.cc:
  Improve comments
sql/set_var.cc:
  Improve comments
sql/sql_class.cc:
  Improve comments
sql/sql_class.h:
  Improve comments

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


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

Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value


mysql-test/r/delete.result:
  Fix for bug #23412: delete rows with null date field
    - test result
mysql-test/t/delete.test:
  Fix for bug #23412: delete rows with null date field
    - test case
sql/sql_delete.cc:
  Fix for bug #23412: delete rows with null date field
    - during SELECT queries processing we convert 'date[time]_field is null'                   
      conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null                  
      DATE and DATETIME fields. To be consistent, we have to do the same for DELETE            
      queries. So we should call remove_eq_conds() in the mysql_delete() as well.              
      Also it may simplify and speed up DELETE queries execution.

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

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

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


sql/sql_parse.cc:
  Auto merged

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


sql/sql_select.cc:
  Auto merged

include/mysql_h_abi.ic:
  Update for 5.1, don't include the info_buffer it should be an error

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


mysql-test/t/ctype_utf8.test:
  Auto merged

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


include/Makefile.am:
  Manual merge

 - Improve icheck rules in Makefile.am


include/Makefile.am:
  Remove m_ctype from BUILT_SOURCES, it has been in bk for a looong time.
  Improve the icheck rules
   - Abort make if icheck fails to compare, very important.
   - Don't include include files from /usr into the icheck file. Avoids problem when running
     icheck on different machines.
   - If no icheck is availabel, touch the mysql_h.ic file so it exists for "make dist"
include/mysql_h_abi.ic:
  Remove all include files from /usr, no need to check that!

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


client/mysql.cc:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged

 - Add two null bytes in  "buff" variable allowing us to call
   get_arg two times also for strings longer than sizeof(buff) 


client/mysql.cc:
  Make sure there are _two_ zero bytes at the end of buff, to allow 'get_arg' to be
  called twice on long strings. The first time it will mark end of string with a
  zero and the second time it will "skip ahead" to the first zero, and the find the
  second one indicating end of buff.
mysql-test/r/mysql.result:
  Update test results
mysql-test/t/mysql.test:
  Add tests for "com_connect" function in mysql
  Add test reported in bug

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

 - As a sideeffect of the patch to generate lex_hash.h only once
on the machine where the source dist was produced, a problem
was found when compiling a mysqld without partition support - it 
would crash when looking up the lex symbols due to mismatch between
lex.h and the generated lex_hash.h

 - Remove the ifdef for partition in lex.h 
 - Fix minor problem with"EXPLAIN PARTITION" when not compiled with
   partition(existed also without the above patch)
 - Add test case that will be run when we don't have partition
   support compiled into mysqld
 - Return error ER_FEATURE_DISABLED if user tries to use PARTITION
   when there is no support for it.


sql/lex.h:
  There should be no ifdefs of features in lex.h
sql/sql_class.cc:
  In line with the comment in sql_yacc.yy that we want the same output
  from "EXPLAIN PARTITIONS.." regardless of wheter we have compiled in
  support for partition  or not, remove the ifdef so the extra field
  is added to output if the DESCRIBE_PARTITIONS bit it set. Without
  this patch we get a crash as the code in select_describe believes the
  field is there.
sql/sql_select.cc:
  Use "const" for the variable as it's a ssigned once and never changes
sql/sql_yacc.yy:
  Don't allow PARTITION syntax oif there is no suport for partitioning
mysql-test/r/not_partition.require:
  New BitKeeper file ``mysql-test/r/not_partition.require''
mysql-test/r/not_partition.result:
  New BitKeeper file ``mysql-test/r/not_partition.result''
mysql-test/t/not_partition.test:
  New BitKeeper file ``mysql-test/t/not_partition.test''

- Rmove duplicate code to log a "DROP VIEW..", must be a merge miss 


sql/sql_view.cc:
  The query should only be logged to binlog once and that is if the drop didn't produce any errors
  Removing the duplicate as that must have been a merge error

When executing the init_connect statement, thd->net.vio is set to 0, to         
forbid sending any results to the client. As a side effect we don't log         
possible errors, either.                                                        
                                                                                
Now we write warnings to the error log if an init_connect query                
fails.                                                                          


sql/sql_parse.cc:
  Fix for bug #22158: Errors in init_connect terminate connections silently
  - raise warnings if the init_connect execution fails.

BitKeeper/triggers/pre-outgoing.crash-protect.pl:
  Don't print message if nothing is wrong.
BitKeeper/triggers/pre-resolve.crash-protect.pl:
  Don't print message if nothing is wrong.

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


configure.in:
  Use local
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Use local
BitKeeper/deleted/.del-make_win_bin_dist:
  Use local
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/view.test:
  SCCS merged
mysys/mf_iocache.c:
  Auto merged
sql/item_func.cc:
  SCCS merged
sql/opt_range.cc:
  SCCS merged
sql/opt_range.h:
  SCCS merged
sql/sql_lex.cc:
  SCCS merged
sql/sql_lex.h:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged
sql/table.cc:
  SCCS merged
storage/myisam/sort.c:
  Use local
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge

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


configure.in:
  Auto merged

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


mysql-test/lib/mtr_cases.pl:
  Auto merged

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


mysql-test/lib/mtr_cases.pl:
  Auto merged

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


tests/mysql_client_test.c:
  Auto merged

Remove one warning


tests/mysql_client_test.c:
  Fix memory leaks
  Remove one warning

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


mysql-test/t/ctype_utf8.test:
  Auto merged

Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.


mysql-test/t/ctype_utf8.test:
  Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.

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


mysql-test/mysql-test-run.pl:
  Use remote version of mysql-test-run.pl