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


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
vio/viosocket.c:
  Auto merged

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

into  naruto.:C:/cpp/bug23010/my51-bug23010


mysys/my_seek.c:
  Auto merged

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

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

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


mysql-test/r/union.result:
  Manual merge (use local)
sql/sql_lex.cc:
  SCCS merged
sql/sql_lex.h:
  SCCS merged
sql/sql_parse.cc:
  Manual merge (use local)
sql/sql_prepare.cc:
  Manual merge (use local)
sql/sql_yacc.yy:
  SCCS merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/r/show_check.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
mysql-test/t/show_check.test:
  Manual merge

into  dator5.(none):/home/pappa/bug18198


mysql-test/r/partition.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_partition.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_cmpfunc.h:
  e

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

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


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

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


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_compress.result:
  SCCS merged
mysql-test/t/func_compress.test:
  SCCS merged

We don't set null_value to 0 in the Item_func_compress::val_str() for 
not-NULL results.


mysql-test/r/func_compress.result:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - test result.
mysql-test/t/func_compress.test:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - test case.
sql/item_strfunc.cc:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - set null_value.

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


BitKeeper/etc/collapsed:
  auto-union
sql/sql_acl.cc:
  Auto merged

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real


include/violite.h:
  SCCS merged
sql/net_serv.cc:
  SCCS merged
vio/viosocket.c:
  SCCS merged

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real


include/violite.h:
  SCCS merged
sql/net_serv.cc:
  SCCS merged
vio/viosocket.c:
  SCCS merged

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678


BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220:
  Use local.
include/violite.h:
  Use local.
sql/net_serv.cc:
  Use local.
vio/viosocket.c:
  Use local.

Do not consider SHOW commands slow queries, just because they don't use proper indexes.

This bug fix is not needed in 5.1, and the code changes will be null merged.  However, the test cases will be propogated up to 5.1.


mysql-test/t/show_check-master.opt:
  Rename: BitKeeper/deleted/.del-show_check-master.opt -> mysql-test/t/show_check-master.opt
mysql-test/r/ps.result:
  Add test case for bug 19764
mysql-test/r/show_check.result:
  Add test case for bug 19764
mysql-test/r/union.result:
  Adjust test case results based on bug #19764 changes
mysql-test/t/ps.test:
  Add test case for bug 19764
mysql-test/t/show_check.test:
  Add test case for bug 19764
sql/sql_parse.cc:
  Do not log SHOW commands as slow queries just because they don't use indexes.
sql/sql_prepare.cc:
  Save stmt_backup.lex->orig_sql_command for use in log_slow_statement()
mysql-test/t/ps-master.opt:
  Add log-slow-queries and --log-queries-not-using indexes, to test bug #19764

sql/sp.cc:
  Update binlog-writing scheme to 5.1 model.
sql/sql_acl.cc:
  Update binlog-writing scheme to 5.1 model.
sql/sql_trigger.cc:
  Update binlog-writing scheme to 5.1 model.

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

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


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/handler.cc:
  Auto merged

into  polly.local:/tmp/maint/bug22728/my51-bug22728


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
sql/handler.cc:
  Auto merged

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


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

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


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

into  polly.local:/tmp/maint/bug22728/my50-bug22728


mysql-test/r/innodb_mysql.result:
  Null merge from 4.1
mysql-test/t/innodb_mysql.test:
  Null merge from 4.1
sql/handler.cc:
  Null merge from 4.1

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


netware/BUILD/compile-netware-max-debug:
  Auto merged
netware/BUILD/compile-netware-max:
  Auto merged

netware/BUILD/compile-netware-max:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-max-debug:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-src:
  Change mode to -rwxrwxr-x

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


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

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


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

Fix warning about value from "*ptr++" not being used. Changed it to ptr++ 

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


netware/BUILD/mwenv:
  Auto merged

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


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

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


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

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

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