Pure coverage tests (debug only)


include/mysql.h:
  Remove un-used variables
tests/client_test.c:
  Pure coverage tests (debug only)

Remove get_binary_length 
Enable the clients to work wih date,time and ts directly with binary protocol

  Temporary fix to make the new client/server protocol to work: fetch all columns in an index, even if not needed by the SELECT statement; Monty has to fix the parser to tell InnoDB what to fetch


sql/ha_innodb.cc:
  Temporary fix to make the new client/server protocol to work: fetch all columns in an index, even if not needed by the SELECT statement; Monty has to fix the parser to tell InnoDB what to fetch

Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)


include/errmsg.h:
  Remove compiler warning
libmysql/libmysql.c:
  Avoid memory overruns when buffer_length is too small
libmysqld/lib_sql.cc:
  Fixed function name
sql/mysqld.cc:
  Code cleanup; Added back shared memory support (which was accidently deleted)
sql/sql_parse.cc:
  Clean up multi-query

into myvenu.com:/home/venu/bk/src-4.1

into myvenu.com:/home/venu/bk/src-4.1

when optimized).


sql/protocol.cc:
  Put inline back and added missing return.

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

BitKeeper/deleted/.del-emb_sample.tds~3555f163bebc8355:
  Delete: libmysqld/examples/builder-sample/emb_sample.tds
BitKeeper/deleted/.del-libmysqld.lib~eeb4bc25c97947da:
  Delete: libmysqld/examples/builder-sample/libmysqld.lib

tests/client_test.c:
  Fix the tests
include/mysql.h:
  Remove bind_length
libmysql/libmysql.c:
  Remove bind_length

client/mysql.cc:
  Auto merged
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mf_iocache.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/protocol.cc:
  SCCS merged

VC++Files/bdb/bdb.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/Berkeley_DB.dsw:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_archive.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_buildall.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_checkpoint.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_deadlock.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_dll.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_dump.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_java.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_load.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_printlog.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_recover.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_stat.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_static.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_static1.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_tcl.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_test.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_upgrade.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/db_verify.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_access.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_btrec.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_env.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_lock.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_mpool.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/ex_tpcb.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_access.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_btrec.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_env.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_lock.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_mpool.dsp:
  Update to 4.1.0
VC++Files/bdb/build_win32/excxx_tpcb.dsp:
  Update to 4.1.0
VC++Files/client/mysql.dsp:
  Update to 4.1.0
VC++Files/client/mysqladmin.dsp:
  Update to 4.1.0
VC++Files/client/mysqlcheck.dsp:
  Update to 4.1.0
VC++Files/client/mysqlclient.dsp:
  Update to 4.1.0
VC++Files/client/mysqlclient.dsw:
  Update to 4.1.0
VC++Files/client/mysqldump.dsp:
  Update to 4.1.0
VC++Files/client/mysqlimport.dsp:
  Update to 4.1.0
VC++Files/client/mysqlshow.dsp:
  Update to 4.1.0
VC++Files/comp_err/comp_err.dsp:
  Update to 4.1.0
VC++Files/contrib/asm386/zlibvc.dsp:
  Update to 4.1.0
VC++Files/contrib/asm386/zlibvc.dsw:
  Update to 4.1.0
VC++Files/contrib/minizip/zlibvc.dsp:
  Update to 4.1.0
VC++Files/contrib/minizip/zlibvc.dsw:
  Update to 4.1.0
VC++Files/dbug/dbug.dsp:
  Update to 4.1.0
VC++Files/dbug/dbug.dsw:
  Update to 4.1.0
VC++Files/heap/heap.dsp:
  Update to 4.1.0
VC++Files/innobase/innobase.dsp:
  Update to 4.1.0
VC++Files/isam/isam.dsp:
  Update to 4.1.0
VC++Files/isam/isam.dsw:
  Update to 4.1.0
VC++Files/isamchk/isamchk.dsp:
  Update to 4.1.0
VC++Files/libmysql/libmysql.dsw:
  Update to 4.1.0
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Update to 4.1.0
VC++Files/libmysqld/libmysqld.dsp:
  Update to 4.1.0
VC++Files/libmysqltest/myTest.dsp:
  Update to 4.1.0
VC++Files/libmysqltest/mytest.dsw:
  Update to 4.1.0
VC++Files/merge/merge.dsp:
  Update to 4.1.0
VC++Files/merge/merge.dsw:
  Update to 4.1.0
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Update to 4.1.0
VC++Files/myisam/myisam.dsp:
  Update to 4.1.0
VC++Files/myisamchk/myisamchk.dsp:
  Update to 4.1.0
VC++Files/myisamlog/myisamlog.dsp:
  Update to 4.1.0
VC++Files/myisammrg/myisammrg.dsp:
  Update to 4.1.0
VC++Files/myisampack/myisampack.dsp:
  Update to 4.1.0
VC++Files/mysql.dsp:
  Update to 4.1.0
VC++Files/mysql.dsw:
  Update to 4.1.0
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Update to 4.1.0
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Update to 4.1.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Update to 4.1.0
VC++Files/mysqlmanager/MySqlManager.dsp:
  Update to 4.1.0
VC++Files/mysqlmanager/mysqlmanager.dsw:
  Update to 4.1.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Update to 4.1.0
VC++Files/mysqlshutdown/myshutdown.dsp:
  Update to 4.1.0
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Update to 4.1.0
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Update to 4.1.0
VC++Files/mysys/mysys.dsp:
  Update to 4.1.0
VC++Files/mysys/mysys.dsw:
  Update to 4.1.0
VC++Files/pack_isam/pack_isam.dsp:
  Update to 4.1.0
VC++Files/perror/perror.dsp:
  Update to 4.1.0
VC++Files/regex/regex.dsp:
  Update to 4.1.0
VC++Files/regex/regex.dsw:
  Update to 4.1.0
VC++Files/replace/replace.dsp:
  Update to 4.1.0
VC++Files/sql/mysqld.dsp:
  Update to 4.1.0
VC++Files/sql/mysqld.dsw:
  Update to 4.1.0
VC++Files/sql/mysqldmax.dsp:
  Update to 4.1.0
VC++Files/sql/old/mysqld.dsw:
  Update to 4.1.0
VC++Files/strings/MASM6x/strings.dsp:
  Update to 4.1.0
VC++Files/strings/MASM6x/strings.dsw:
  Update to 4.1.0
VC++Files/strings/backup/strings.dsp:
  Update to 4.1.0
VC++Files/strings/backup/strings.dsw:
  Update to 4.1.0
VC++Files/strings/noMASM/strings.dsp:
  Update to 4.1.0
VC++Files/strings/noMASM/strings.dsw:
  Update to 4.1.0
VC++Files/strings/strings.dsp:
  Update to 4.1.0
VC++Files/strings/strings.dsw:
  Update to 4.1.0
VC++Files/test1/test1.dsp:
  Update to 4.1.0
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Update to 4.1.0
VC++Files/thr_test/thr_test.dsp:
  Update to 4.1.0
VC++Files/vio/vio.dsp:
  Update to 4.1.0
VC++Files/zlib/zlib.dsp:
  Update to 4.1.0
bdb/build_win32/Berkeley_DB.dsw:
  Update to 4.1.0

mysql-test/t/fulltext2.test:
  fixed

Some changes to the prepared statement protocol to make it easier to use and faster.


Makefile.am:
  Fix to make dist to work with cmd-line-utils
client/mysql.cc:
  Portability fixes
client/mysqlbinlog.cc:
  Portabiliy fixes and remove usafe of FILE
configure.in:
  Fix to make dist to work with cmd-line-utils
heap/_check.c:
  Portability fixes
include/config-win.h:
  Portability fixes
include/m_ctype.h:
  Indentation cleanup
include/my_list.h:
  Portability fixes
include/mysql.h:
  Cleanup of BIND structure
include/violite.h:
  Portability fixes
innobase/dict/dict0dict.c:
  Portability fixes
innobase/dict/dict0load.c:
  Portability fixes
innobase/include/os0proc.h:
  Portability fixes (Heikki, please check)
innobase/os/os0proc.c:
  Portability fixes (Heikki, please check)
innobase/ut/ut0ut.c:
  Portability fixes
isam/pack_isam.c:
  Portability fixes
libmysql/libmysql.c:
  Portability fixes
  Remove obscure usage of the length parameter for prepared statements.
libmysql/libmysql.def:
  Remove not existing functions
libmysqld/lib_sql.cc:
  Remove compiler warning
mysql-test/r/explain.result:
  Fix after merge
mysql-test/r/join.result:
  Fix after merge
mysys/my_once.c:
  Portability fix
mysys/tree.c:
  Portability fixes
sql/field.cc:
  Portability fixes
sql/filesort.cc:
  move assert.h to mysql_priv.h
sql/ha_berkeley.cc:
  move assert.h to mysql_priv.h
sql/ha_innodb.cc:
  move assert.h to mysql_priv.h
sql/item.cc:
  move assert.h to mysql_priv.h
  Fixed syntax error
sql/item_cmpfunc.cc:
  move assert.h to mysql_priv.h
sql/item_func.cc:
  move assert.h to mysql_priv.h
sql/item_row.cc:
  move assert.h to mysql_priv.h
sql/item_strfunc.cc:
  Portability fix
sql/item_subselect.cc:
  Portability fix
sql/item_sum.cc:
  move assert.h to mysql_priv.h
sql/lex.h:
  Portability fix
sql/lock.cc:
  move assert.h to mysql_priv.h
sql/log.cc:
  move assert.h to mysql_priv.h
sql/log_event.cc:
  Portability fix
sql/mf_iocache.cc:
  move assert.h to mysql_priv.h
sql/mysql_priv.h:
  move assert.h to mysql_priv.h
sql/mysqld.cc:
  move assert.h to mysql_priv.h
sql/opt_range.cc:
  move assert.h to mysql_priv.h
sql/password.c:
  Portability fix
sql/protocol.cc:
  move assert.h to mysql_priv.h
sql/set_var.cc:
  Portability fix
sql/slave.cc:
  move assert.h to mysql_priv.h
sql/spatial.cc:
  Portability fix
sql/sql_acl.cc:
  move assert.h to mysql_priv.h
sql/sql_base.cc:
  move assert.h to mysql_priv.h
sql/sql_cache.cc:
  move assert.h to mysql_priv.h
sql/sql_class.cc:
  move assert.h to mysql_priv.h
sql/sql_handler.cc:
  move assert.h to mysql_priv.h
sql/sql_help.cc:
  Removed compiler warning
sql/sql_lex.cc:
  Portability fix
sql/sql_lex.h:
  Portability fix
sql/sql_parse.cc:
  move assert.h to mysql_priv.h
sql/sql_prepare.cc:
  move assert.h to mysql_priv.h
sql/sql_repl.cc:
  move assert.h to mysql_priv.h
sql/sql_select.cc:
  move assert.h to mysql_priv.h
sql/sql_string.cc:
  Portability fix
sql/sql_string.h:
  Portability fix
sql/sql_table.cc:
  move assert.h to mysql_priv.h
sql/sql_yacc.yy:
  Portability fix
  Remove not accessed code
strings/ctype-bin.c:
  Portability fix
strings/ctype-mb.c:
  Portability fix
strings/ctype.c:
  Portability fix
tests/client_test.c:
  A

include/myisam.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged

myisam/ftdefs.h:
  intermediate cleanup checkin
myisam/mi_create.c:
  intermediate cleanup checkin
myisam/myisamchk.c:
  intermediate cleanup checkin
myisam/ft_parser.c:
  intermediate cleanup checkin
myisam/ft_update.c:
  intermediate cleanup checkin
myisam/mi_update.c:
  intermediate cleanup checkin
mysql-test/r/fulltext.result:
  stopword test
mysql-test/t/fulltext.test:
  stopword test
mysys/mulalloc.c:
  function comments clarified
include/my_handler.h:
  get_key_length_rdonly utility macro
include/myisam.h:
  this kind of hacks bites :)
myisam/ft_dump.c:
  bugfix
myisam/mi_open.c:
  bugfix
myisam/sort.c:
  bugfixing
myisam/mi_rnext.c:
  not a solution at all, but a temporary fix to make
  mi_rnext to work on ft2 index. (only ft_dump uses mi_rnext
  on fulltext indexes for now).
myisam/ft_boolean_search.c:
  ft_sintXkorr, ft_intXstore
myisam/ft_nlq_search.c:
  ft_sintXkorr, ft_intXstore
myisam/fulltext.h:
  ft_sintXkorr, ft_intXstore
myisam/mi_check.c:
  ft_sintXkorr, ft_intXstore
myisam/ft_static.c:
  two-level tree support in wi_write()
myisam/mi_write.c:
  two-level tree support in wi_write()
myisam/myisamdef.h:
  two-level tree support in wi_write()
myisam/mi_delete.c:
  support for ft2 in mi_delete
mysql-test/r/fulltext2.result:
  support for ft2 in mi_delete
mysql-test/t/fulltext2.test:
  support for ft2 in mi_delete

into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_derived.cc:
  resolve fix.

into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of cardinality error
mysql-test/t/subselect.test:
  test of cardinality error

sql/mysqld.cc:
  removing debugging stuff
sql/sql_derived.cc:
  fix removed

into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1


sql/ha_innodb.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

sql/sql_derived.cc:
  I think it's better not to implement another "*any*"

into myvenu.com:/home/venu/bk/src-4.1


sql/sql_parse.cc:
  Auto merged

  Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1


sql/ha_innodb.cc:
  Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1

mysql-test/r/explain.result:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged

mysql-test/r/explain.result:
  test of bug with EXPLAIN on empty table
mysql-test/t/explain.test:
  test of bug with EXPLAIN on empty table

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
libmysqld/libmysqld.c:
  conflicts resolving

embedded-related changes


include/mysql_com.h:
  net_flush emptification
libmysqld/lib_sql.cc:
  Some Protocol:: methods implemented
sql/convert.cc:
  changes to use convert in embedded library
sql/field.cc:
  set_key_image changed
sql/item.cc:
  obsolete functions removed
sql/item.h:
  embedded-related changes in Protocol class
sql/log.cc:
  there's no ports in embedded library
sql/mysqld.cc:
  some debug stuff
sql/protocol.cc:
  embedded-related changes
sql/protocol.h:
  embedded-related changes
sql/sql_cache.cc:
  comment added
sql/sql_class.cc:
  no need to do special embedded select_send::send_row
sql/sql_class.h:
  embedded-related changes
sql/sql_parse.cc:
  comments added debugging stuff deleted
sql/sql_show.cc:
  non-protocol sending removed

mysql-test/r/join.result:
  Test of LEFT JOIN bug
mysql-test/t/join.test:
  Test of LEFT JOIN bug

sql/sql_parse.cc:
  Auto merged
tests/client_test.c:
  Auto merged

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/log_event.cc:
  merge with 4.0
sql/sql_db.cc:
  merge with 4.0 (use local)