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

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

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)

cmd-line-utils/libedit/chared.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/common.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/el.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/emacs.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/fgetln.c:
  Removed RCSID to get rid of compiler warnings
  Removed compiler warning
cmd-line-utils/libedit/hist.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/history.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/key.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/map.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/parse.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/prompt.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/read.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/readline.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/refresh.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/search.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/sig.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/term.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/tokenizer.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/tty.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/vi.c:
  Removed RCSID to get rid of compiler warnings
mysys/Makefile.am:
  Remove library dependency for charset2html to get correct makefile
tests/client_test.c:
  Indentation change

This fixes a problem with SHOW PROCESSLIST


sql/log_event.cc:
  Fixes cases where thd->query was not protected
sql/sql_acl.cc:
  Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_db.cc:
  Fixes cases where thd->query was not protected

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
innobase/btr/btr0sea.c:
  Merge with 3.23 (use local file)
sql/slave.cc:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23
sql/sql_parse.cc:
  Merge with 3.23

This fixes a possible core dump problem in SHOW PROCESSLIST


sql/slave.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
  Also first set query_length, then query
sql/sql_parse.cc:
  Indentation changes

into myvenu.com:/home/venu/work/sql/dev-4.1

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


libmysql/libmysql.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

client/insert_test.c:
  Fixed core dump in test

BitKeeper/etc/ignore:
  added cmd-line-utils/libedit/common.h
mysys/queues.c:
  Added comments
sql/sql_parse.cc:
  Simple code cleanup
tests/grant.res:
  Updated results for 4.1

sql/sql_table.cc:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.control

into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.clone

cmd-line-utils/readline/.cvsignore:
  mvdir
cmd-line-utils/readline/COPYING:
  mvdir
cmd-line-utils/readline/INSTALL:
  mvdir
cmd-line-utils/readline/Makefile.am:
  mvdir
cmd-line-utils/readline/README:
  mvdir
cmd-line-utils/readline/ansi_stdlib.h:
  mvdir
cmd-line-utils/readline/bind.c:
  mvdir
cmd-line-utils/readline/callback.c:
  mvdir
cmd-line-utils/readline/chardefs.h:
  mvdir
cmd-line-utils/readline/complete.c:
  mvdir
cmd-line-utils/readline/configure.in:
  mvdir
cmd-line-utils/readline/display.c:
  mvdir
cmd-line-utils/readline/emacs_keymap.c:
  mvdir
cmd-line-utils/readline/funmap.c:
  mvdir
cmd-line-utils/readline/histexpand.c:
  mvdir
cmd-line-utils/readline/histfile.c:
  mvdir
cmd-line-utils/readline/histlib.h:
  mvdir
cmd-line-utils/readline/history.c:
  mvdir
cmd-line-utils/readline/history.h:
  mvdir
cmd-line-utils/readline/histsearch.c:
  mvdir
cmd-line-utils/readline/input.c:
  mvdir
cmd-line-utils/readline/isearch.c:
  mvdir
cmd-line-utils/readline/keymaps.c:
  mvdir
cmd-line-utils/readline/keymaps.h:
  mvdir
cmd-line-utils/readline/kill.c:
  mvdir
cmd-line-utils/readline/macro.c:
  mvdir
cmd-line-utils/readline/mbutil.c:
  mvdir
cmd-line-utils/readline/misc.c:
  mvdir
cmd-line-utils/readline/nls.c:
  mvdir
cmd-line-utils/readline/parens.c:
  mvdir
cmd-line-utils/readline/posixdir.h:
  mvdir
cmd-line-utils/readline/posixjmp.h:
  mvdir
cmd-line-utils/readline/posixstat.h:
  mvdir
cmd-line-utils/readline/readline.c:
  mvdir
cmd-line-utils/readline/readline.h:
  mvdir
cmd-line-utils/readline/rlconf.h:
  mvdir
cmd-line-utils/readline/rldefs.h:
  mvdir
cmd-line-utils/readline/rlmbutil.h:
  mvdir
cmd-line-utils/readline/rlprivate.h:
  mvdir
cmd-line-utils/readline/rlshell.h:
  mvdir
cmd-line-utils/readline/rlstdc.h:
  mvdir
cmd-line-utils/readline/rltty.c:
  mvdir
cmd-line-utils/readline/rltty.h:
  mvdir
cmd-line-utils/readline/rltypedefs.h:
  mvdir
cmd-line-utils/readline/rlwinsize.h:
  mvdir
cmd-line-utils/readline/search.c:
  mvdir
cmd-line-utils/readline/shell.c:
  mvdir
cmd-line-utils/readline/signals.c:
  mvdir
cmd-line-utils/readline/tcap.h:
  mvdir
cmd-line-utils/readline/terminal.c:
  mvdir
cmd-line-utils/readline/text.c:
  mvdir
cmd-line-utils/readline/tilde.c:
  mvdir
cmd-line-utils/readline/tilde.h:
  mvdir
cmd-line-utils/readline/undo.c:
  mvdir
cmd-line-utils/readline/util.c:
  mvdir
cmd-line-utils/readline/vi_keymap.c:
  mvdir
cmd-line-utils/readline/vi_mode.c:
  mvdir
cmd-line-utils/readline/xmalloc.c:
  mvdir
cmd-line-utils/readline/xmalloc.h:
  mvdir

Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows


client/mysql.cc:
  Removed compiler warnings.
  Make quote handling simpler
include/config-win.h:
  Fix for myisam/rt_mbr.c
include/mysql.h:
  Change client_flag to unsigned long to handle more options.
libmysql/libmysql.c:
  Change client_flag to unsigned long to handle more options.
libmysqld/libmysqld.c:
  Change client_flag to unsigned long to handle more options.
myisam/rt_mbr.c:
  Portability fix for Windows
mysql-test/r/rpl_loaddata.result:
  Fix test case
sql/item_strfunc.cc:
  Don't use new password format if mysql.user has old format
sql/item_strfunc.h:
  Don't use new password format if mysql.user has old format
sql/mysql_priv.h:
  Don't use new password format if mysql.user has old format
sql/mysqld.cc:
  Don't use new password format if mysql.user has old format
sql/sql_acl.cc:
  Don't use new password format if mysql.user has old format.
  tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_class.h:
  Don't use new password format if mysql.user has old format
sql/sql_parse.cc:
  Change client_flag to unsigned long to handle more options.
sql/sql_yacc.yy:
  Don't use new password format if mysql.user has old format
strings/ctype-utf8.c:
  Remove compiler warnings
strings/ctype-win1250ch.c:
  Remove compiler warnings
tests/grant.res:
  Update results

into hundin.mysql.fi:/home/heikki/mysql

  Backport from 4.0: fix bug in adaptive hash index search


innobase/btr/btr0sea.c:
  Backport from 4.0: fix bug in adaptive hash index search

  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert


innobase/btr/btr0sea.c:
  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
innobase/include/btr0sea.h:
  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert

sql/sql_table.cc:
  superfluous prepare_for_resend deleted

BitKeeper/deleted/.del-typelib.h~216638fc39e3e368:
  Delete: include/typelib.h

BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137:
  Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_unique.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  merge
libmysql/libmysql.def:
  merge
sql/ha_innodb.cc:
  merge
sql/item_cmpfunc.cc:
  merge
sql/log_event.cc:
  merge
sql/sql_handler.cc:
  merge

sql/sql_yacc.yy:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/try_compile/4.1

readline/Makefile.am:
  'removed redundant -I include dirs' in readline/Makefile.am returned!

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

into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear

into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear


sql/log_event.cc:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/BINLOG_LOADDATA/4.1.clear


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

client/mysqlbinlog.cc:
  new option --local-load
sql/log_event.cc:
  converting 'load' to 'local load'
sql/log_event.h:
  converting 'load' to 'local load'