into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my51-bug21618


client/mysql.cc:
  Manual merge.
mysql-test/r/mysql.result:
  Manual merge.
mysql-test/t/mysql.test:
  Manual merge.

The column's NOT NULL flag doesn't affect what we should print.  Remove the
wrong logic that does check it.

Also, verify that this and the previous two tests print the same data as 
other output formats.


client/mysql.cc:
  Don't check the column's NOT NULL flag when determining whether to print 
  "NULL" or not.
mysql-test/r/mysql.result:
  Add results and confirm that the other output forms give the same results
  for other similar tests.
mysql-test/t/mysql.test:
  Add regression tests for this bug and two similar bugs.

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

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


vio/viosocket.c:
  Auto merged

into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint


sql/item_strfunc.cc:
  Auto merged

into  maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583


mysql-test/r/type_bit.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx


sql/sql_class.h:
  Auto merged

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51


libmysqld/libmysqld.def:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
sql/log.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work

into  polly.local:/tmp/20924/bug20294/my51-bug20294


mysql-test/r/case.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/user_var.result:
  Manual merge
mysql-test/t/user_var.test:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/item_func.h:
  Manual merge

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

into  polly.local:/tmp/20924/bug20294/my50-bug20294


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/case.result:
  Manual merge
mysql-test/r/func_if.result:
  Manual merge
mysql-test/r/func_test.result:
  Manual merge
mysql-test/r/user_var.result:
  Manual merge
mysql-test/t/case.test:
  Manual merge
mysql-test/t/func_if.test:
  Manual merge
mysql-test/t/func_test.test:
  Manual merge
mysql-test/t/user_var.test:
  Manual merge
sql/item_func.cc:
  Manual merge

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


client/mysqldump.c:
  Auto merged

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

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


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged

into  naruto.:C:/cpp/mysql-5.1-maint


storage/myisam/mi_locking.c:
  Auto merged

mysql-test/r/case.result:
  Post-review fix for bug #20924
mysql-test/r/func_if.result:
  Post-review fix for bug #20924
mysql-test/r/func_test.result:
  Post-review fix for bug #20924
mysql-test/r/user_var.result:
  Post-review fix for bug #20924
mysql-test/t/case.test:
  Post-review fix for bug #20924
mysql-test/t/func_if.test:
  Post-review fix for bug #20924
mysql-test/t/func_test.test:
  Post-review fix for bug #20924
mysql-test/t/user_var.test:
  Post-review fix for bug #20924
sql/item_func.cc:
  Post-review fix for bug #20924
sql/item_func.h:
  Post-review fix for bug #20924
sql/log_event.cc:
  Post-review fix for bug #20924

 - When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file 
   descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge
   table causes a server crash on windows. This patch adds a test for bad file descriptors when a 
   table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES
   will be necessary to further operate on the associated merge table.


myisam/mi_locking.c:
  This patch prevents the windows built to crash if the file is closed.
mysql-test/r/windows.result:
  Added test case for the windows built.
mysql-test/t/windows.test:
  Added test case for the windows built.

  Fixing failed merge


sql/log.cc:
  Fixing failed merge

More specifically, the scripts/Makefile isn't created and it doesn't
translate mysql_fix_privilege_tables ".sh" .  So, 
mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
/bin/false instead.  That obviously doesn't "fix" anything and the 
test fails because of it.


mysql-test/t/system_mysql_db_fix.test:
  Change stolen from the -win tree.

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch

functions and return it.


vio/viosocket.c:
  Initialize the return code and set it according to errors in the closing 
  functions.

mysql-test/t/crash_commit_before.test:
  Server need to be compiled with innodb support for this test case to suceed

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


sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge

mysql-test/mysql-test-run.pl:
  Don't set LD_LIBRARY_PATH  to the ndb dirs if ndb support is not available

 - Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb.
   This is inline with how it's done in other handlers.


sql/ha_innodb.cc:
  Add ifdef for WITH_INNOBASE_STORAGE_ENGINE around all code in ha_innodb.cc so it's only included if we have defined --with-innodb to configure

- Honor unsigned_flag in the corresponding functions
- Use compare_int_signed_unsigned()/compare_int_unsigned_signed() instead of explicit comparison in GREATEST() and LEAST()


mysql-test/r/case.result:
  Added test case for bug #20924
mysql-test/r/func_if.result:
  Added test case for bug #20924
mysql-test/r/func_test.result:
  Added test case for bug #20924
mysql-test/r/user_var.result:
  Added test case for bug #20924
mysql-test/t/case.test:
  Added test case for bug #20924
mysql-test/t/func_if.test:
  Added test case for bug #20924
mysql-test/t/func_test.test:
  Added test case for bug #20924
mysql-test/t/user_var.test:
  Added test case for bug #20924
sql/item_cmpfunc.cc:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  - Moved some code out of Arg_comparator to external functions to be reused in Item_func_min_max
  - Fixed IFNULL(), IF(), CASE() and COALESCE()
sql/item_cmpfunc.h:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  - Moved some code out of Arg_comparator to external functions to be reused in Item_func_min_max
sql/item_func.cc:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  Fixed LEAST(), GREATEST() and "SET @A=..." parts
sql/item_func.h:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  Fixed "SET @A=..." part
sql/sql_class.h:
  Bug #20924: CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
  
  Fixed "SET @A=..." part

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


configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_mgm.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

storage/archive/azio.c:
  Fixed warnings for windows
storage/federated/ha_federated.cc:
  Warning fixes for Windows
storage/innobase/CMakeLists.txt:
  Fixed includes for Windows

sql/handler.h:
  Adding Falcon

sql/CMakeLists.txt:
  Compile problem for Windoows
storage/innobase/handler/ha_innodb.cc:
  Removed some dead code (Marko approved)

Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning. 


sql/handler.h:
  Extended to add in more DB types for partioning.

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

storage/innobase/handler/ha_innodb.h:
  Rename: sql/ha_innodb.h -> storage/innobase/handler/ha_innodb.h
libmysqld/Makefile.am:
  Removed Innodb specific mention
sql/Makefile.am:
  Updated to remove innodb
storage/innobase/CMakeLists.txt:
  Added include directory
storage/innobase/Makefile.am:
  Updated to add in handler
storage/innobase/handler/ha_innodb.cc:
  Adjusted include files, also disabled replication code which was not being used.
storage/innobase/plug.in:
  Added additional Makefile
storage/innobase/handler/Makefile.am:
  New BitKeeper file ``storage/innobase/handler/Makefile.am''

fixed multiple and missing deinitializations, moved all
deinit/del code in one place

remove #define __attribute__(A) from plugin.h
increase API version because placeholders were added
more robust definition of min_plugin_interface_version


include/mysql/plugin.h:
  move #define __attribute__(A) out of plugin.h (not part of the API)
  increase API version because placeholders were added
plugin/fulltext/plugin_example.c:
  compilation failure on non-GCC compilers
sql/sql_plugin.cc:
  more robust definition of min_plugin_interface_version
  it should work even when we forget to update it