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
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
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
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/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
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
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
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
