Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
Delete: mysql-test/include/have_openssl_2.inc
BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
Delete: mysql-test/r/have_openssl_2.require
BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
Delete: mysql-test/t/openssl_2.test
BitKeeper/etc/ignore:
added libmysql/vio_priv.h libmysql_r/vio_priv.h
client/mysql.cc:
vio ssl structure renames
include/violite.h:
Cleanup violite.h interface (move things to vio_priv.h)
libmysql/Makefile.am:
Use vio_priv.h
libmysql/Makefile.shared:
Use vio_priv.h
libmysqld/lib_vio.c:
Added timeout for windows
mysys/my_getopt.c:
Indentaion cleanup
sql/item_cmpfunc.cc:
Remove compiler warnings
sql/item_func.cc:
Remove compiler warnings
sql/mini_client.cc:
vio ssl structure renames
sql/mysqld.cc:
Check on windows if second server is started with same TCP/IP port
sql/net_serv.cc:
Add read/write timeouts for windows
sql/sql_acl.cc:
vio ssl structure renames
sql/sql_show.cc:
vio ssl structure renames
vio/vio.c:
Added timeouts for windows
vio/viosocket.c:
Added timeouts for windows
vio/viossl.c:
Added timeouts for windows
Cleaned up structure element names
vio/viosslfactories.c:
Added timeouts for windows
Cleaned up structure element names
(Mostly code cleanups)
include/my_sys.h:
Removed not used define
myisam/mi_check.c:
Indentation change
mysql-test/t/rpl_insert_id.test:
Add test if server supports innodb
mysys/mf_format.c:
Remove QUOTE handling from fn_format()
(fn_format() should not have anything to do with quoting things)
sql/log_event.cc:
Removed some unnecessary casts (by changing functions to use const char *)
Cleaned up some error messages to make them shorter and (hopefully) more readable.
Fixed wrong format strings
Restored 'thd->options' on error.
sql/mini_client.cc:
Changed order of include files to remove compilation warning
sql/mysqld.cc:
Add proper quoting of service arguments (don't use fn_format)
sql/slave.cc:
Simple optimization and cleanup.
Changed rewrite_db() and print_slave_db_safe() to use const char* to avoid casting of arguments when calling functions.
Cleanup of some error messages.
sql/slave.h:
Changed protypes to use const char *
sql/sql_acl.cc:
Simple optimization
vio/viosslfactories.c:
Changed order of include files to remove compilation warning
sql/sql_acl.cc:
Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
vio/viossl.c:
Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
vio/viosslfactories.c:
Fix bug #673 MySQL 4.0.13 no SSL connection with mysql client possible
This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment.
Docs/manual.texi:
Changelog
include/my_base.h:
Added code to flush a bulk_insert index
myisam/mi_extra.c:
Added code to flush a bulk_insert index
mysql-test/r/insert.result:
test of auto_increment and bulk_insert
mysql-test/t/insert.test:
test of auto_increment and bulk_insert
sql/ha_myisam.cc:
Added code to flush a bulk_insert index
sql/sql_insert.cc:
Mark that bulk_insert is used
sql/sql_load.cc:
Mark that bulk_insert is used
Remove duplicated call to initialize bulk insert
sql/table.h:
Mark that bulk_insert is used
vio/viosslfactories.c:
Remove compiler warning
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
Docs/manual.ja.texi:
e-mail address fixed
include/mysqld_error.h:
Added 3 new errormessages related to SSL
mysql-test/install_test_db.sh:
SSL fix
scripts/mysql_install_db.sh:
mysql.user table changes to conform SSL ACL
sql/lex.h:
Fixed GRANT+SSL clause
sql/share/czech/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/danish/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/dutch/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/english/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/estonian/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/french/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/german/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/greek/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/hungarian/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/italian/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/japanese/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/korean/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/norwegian-ny/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/norwegian/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/polish/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/portuguese/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/romanian/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/russian/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/slovak/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/spanish/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/swedish/errmsg.txt:
Added 3 new errormessages related to SSL
sql/share/ukrainian/errmsg.txt:
Added 3 new errormessages related to SSL
Docs/manual.texi:
SSL fixes
BUILD/compile-pentium-max:
SSL was missing here
acinclude.m4:
typo fix
alignment fix
client/mysql.cc:
SSL fixes
client/mysqladmin.c:
SSL fixes
client/mysqlcheck.c:
SSL fixes
client/mysqldump.c:
SSL fixes
client/mysqlimport.c:
SSL fixes
client/mysqlshow.c:
SSL fixes
include/mysql.h:
SSL fixes
include/sslopt-case.h:
SSL fixes
include/sslopt-longopts.h:
SSL fixes
include/sslopt-usage.h:
SSL fixes
include/sslopt-vars.h:
SSL fixes
include/violite.h:
SSL fixes
cleanups
libmysql/libmysql.c:
SSL fixes
libmysqld/lib_sql.cc:
SSL fixes
sql/mini_client.cc:
SSL fixes
sql/mysqld.cc:
SSL fixes
cleanup
new variables to SHOW STATUS
sql/sql_acl.cc:
SSL fixes
sql/sql_acl.h:
SSL fixes
sql/sql_lex.h:
SSL fixes
sql/sql_parse.cc:
SSL fixes
sql/sql_show.cc:
New functions added
sql/structs.h:
New functions added
vio/test-ssl.c:
SSL fixes
vio/test-sslclient.c:
SSL fixes
vio/test-sslserver.c:
SSL fixes
vio/viosocket.c:
SSL fixes
vio/viossl.c:
SSL fixes
cleanup
vio/viosslfactories.c:
SSL fixes
sql/sql_yacc.yy:
SSL fixes
Fixed problem with LIKE with latin1_de
Added parsing support of UNSIGNED LONG LONG
Docs/manual.texi:
Changelog
client/client_priv.h:
Changed to use my_global.h
client/completion_hash.cc:
Changed to use my_global.h
client/errmsg.c:
Changed to use my_global.h
client/get_password.c:
Changed to use my_global.h
client/mysqldump.c:
Changed to use my_global.h
client/mysqlshow.c:
Changed to use my_global.h
client/mysqltest.c:
Changed to use my_global.h
client/password.c:
Changed to use my_global.h
client/readline.cc:
Changed to use my_global.h
client/sql_string.cc:
Changed to use my_global.h
client/thimble.cc:
Changed to use my_global.h
client/thread_test.c:
Changed to use my_global.h
dbug/dbug.c:
Changed to use my_global.h
dbug/dbug_analyze.c:
Changed to use my_global.h
dbug/example1.c:
Changed to use my_global.h
dbug/example2.c:
Changed to use my_global.h
dbug/example3.c:
Changed to use my_global.h
dbug/factorial.c:
Changed to use my_global.h
dbug/main.c:
Changed to use my_global.h
dbug/sanity.c:
Changed to use my_global.h
extra/comp_err.c:
Changed to use my_global.h
extra/my_print_defaults.c:
Changed to use my_global.h
extra/perror.c:
Changed to use my_global.h
extra/replace.c:
Changed to use my_global.h
extra/resolve_stack_dump.c:
Changed to use my_global.h
extra/resolveip.c:
Changed to use my_global.h
fs/libmysqlfs.h:
Changed to use my_global.h
fs/mysqlcorbafs.h:
Changed to use my_global.h
heap/hp_test1.c:
Changed to use my_global.h
include/Makefile.am:
Changed to use my_global.h
include/m_ctype.h:
Changed to use my_global.h
include/my_base.h:
Changed to use my_global.h
innobase/include/univ.i:
Changed to use my_global.h
libmysql/dll.c:
Changed to use my_global.h
libmysql/errmsg.c:
Changed to use my_global.h
libmysql/get_password.c:
Changed to use my_global.h
libmysql/libmysql.c:
Changed to use my_global.h
libmysql/net.c:
Changed to use my_global.h
libmysql/password.c:
Changed to use my_global.h
libmysqld/lib_sql.cc:
Changed to use my_global.h
libmysqld/lib_vio.c:
Changed to use my_global.h
libmysqld/libmysqld.c:
Changed to use my_global.h
mysql-test/mysql-test-run.sh:
Changed to use latin1 as default character set
mysql-test/r/ctype_latin1_de.result:
Changed to use my_global.h
mysql-test/r/func_like.result:
New test
mysql-test/t/ctype_latin1_de.test:
Added test of part keys
mysql-test/t/func_like.test:
New test
mysys/checksum.c:
Changed to use my_global.h
mysys/getopt.c:
Changed to use my_global.h
mysys/getopt1.c:
Changed to use my_global.h
mysys/make-conf.c:
Changed to use my_global.h
mysys/my_alloc.c:
Changed to use my_global.h
mysys/my_clock.c:
Changed to use my_global.h
mysys/my_compress.c:
Changed to use my_global.h
mysys/mysys_priv.h:
Changed to use my_global.h
mysys/test_charset.c:
Changed to use my_global.h
mysys/testhash.c:
Changed to use my_global.h
mysys/thr_alarm.c:
Changed to use my_global.h
mysys/thr_mutex.c:
Changed to use my_global.h
regex/debug.c:
Changed to use my_global.h
regex/main.c:
Changed to use my_global.h
regex/regcomp.c:
Changed to use my_global.h
regex/regerror.c:
Changed to use my_global.h
regex/regexec.c:
Changed to use my_global.h
regex/regexp.c:
Changed to use my_global.h
regex/regfree.c:
Changed to use my_global.h
regex/reginit.c:
Changed to use my_global.h
sql/cache_manager.cc:
Changed to use my_global.h
sql/gen_lex_hash.cc:
Changed to use my_global.h
sql/ha_berkeley.cc:
Fixed problem with UNIQUE keys that could contain NULL
sql/ha_gemini.h:
Changed to use my_global.h
sql/handler.cc:
Fixed problem after merge
sql/item.cc:
Added Item_unit
sql/item.h:
Added Item_uint
sql/matherr.c:
Changed to use my_global.h
sql/md5.c:
Changed to use my_global.h
sql/mini_client.cc:
Changed to use my_global.h
sql/my_lock.c:
Changed to use my_global.h
sql/mysql_priv.h:
Changed to use my_global.h
sql/net_serv.cc:
Changed to use my_global.h
sql/password.c:
Changed to use my_global.h
sql/sql_lex.cc:
Added parsing support of UNSIGNED LONG LONG
sql/sql_show.cc:
Changed to use my_global.h
sql/sql_string.cc:
Changed to use my_global.h
sql/sql_yacc.yy:
Added usage of Int_uint
sql/stacktrace.c:
Changed to use my_global.h
sql/udf_example.cc:
Changed to use my_global.h
strings/atof.c:
Changed to use my_global.h
strings/bchange.c:
Changed to use my_global.h
strings/bcmp.c:
Changed to use my_global.h
strings/bfill.c:
Changed to use my_global.h
strings/bmove.c:
Changed to use my_global.h
strings/bmove512.c:
Changed to use my_global.h
strings/bmove_upp.c:
Changed to use my_global.h
strings/ctype-big5.c:
Changed to use my_global.h
strings/ctype-czech.c:
Changed to use my_global.h
strings/ctype-euc_kr.c:
Changed to use my_global.h
strings/ctype-gb2312.c:
Changed to use my_global.h
strings/ctype-gbk.c:
Changed to use my_global.h
strings/ctype-latin1_de.c:
Fixed problem with LIKE
strings/ctype-sjis.c:
Changed to use my_global.h
strings/ctype-tis620.c:
Changed to use my_global.h
strings/ctype-ujis.c:
Changed to use my_global.h
strings/ctype.c:
Changed to use my_global.h
strings/do_ctype.c:
Changed to use my_global.h
strings/int2str.c:
Changed to use my_global.h
strings/is_prefix.c:
Changed to use my_global.h
strings/llstr.c:
Changed to use my_global.h
strings/longlong2str.c:
Changed to use my_global.h
strings/r_strinstr.c:
Changed to use my_global.h
strings/str2int.c:
Changed to use my_global.h
strings/str_test.c:
Changed to use my_global.h
strings/strappend.c:
Changed to use my_global.h
strings/strcend.c:
Changed to use my_global.h
strings/strcont.c:
Changed to use my_global.h
strings/strend.c:
Changed to use my_global.h
strings/strfill.c:
Changed to use my_global.h
strings/strings-not-used.h:
Changed to use my_global.h
strings/strinstr.c:
Changed to use my_global.h
strings/strmake.c:
Changed to use my_global.h
strings/strmov.c:
Changed to use my_global.h
strings/strnlen.c:
Changed to use my_global.h
strings/strnmov.c:
Changed to use my_global.h
strings/strstr.c:
Changed to use my_global.h
strings/strto.c:
Changed to use my_global.h
strings/strtol.c:
Changed to use my_global.h
strings/strtoll.c:
Changed to use my_global.h
strings/strtoul.c:
Changed to use my_global.h
strings/strtoull.c:
Changed to use my_global.h
strings/strxmov.c:
Changed to use my_global.h
strings/strxnmov.c:
Changed to use my_global.h
strings/udiv.c:
Changed to use my_global.h
tools/mysqlmanager.c:
Changed to use my_global.h
vio/test-ssl.c:
Changed to use my_global.h
vio/test-sslclient.c:
Changed to use my_global.h
vio/test-sslserver.c:
Changed to use my_global.h
vio/test-ssl:
Changed to use my_global.h
vio/vio.c:
Changed to use my_global.h
vio/viosocket.c:
Changed to use my_global.h
vio/viossl.c:
Changed to use my_global.h
vio/viosslfactories.c:
Changed to use my_global.h
vio/viotest-ssl.c:
Changed to use my_global.h
BitKeeper/etc/ignore:
Added vio/test-sslclient vio/test-sslserver to the ignore list
client/mysql.cc:
Let make mysql client tell user about cipher in use
sql/mini_client.cc:
Synced SSL stuff with libmysql code
sql/mysqld.cc:
Preaparations to turn replication SSL on
Stuff to output SSL variables with SHOW STATUS command
sql/sql_show.cc:
Stuff to output SSL variables with SHOW STATUS command
sql/structs.h:
Stuff to output SSL variables with SHOW STATUS command
vio/viossl.c:
Major modifications
vio/viosslfactories.c:
SSL fixes
Makefile.am:
Moved bio dir into server_dirs in acinclude.in
client/Makefile.am:
We need OpenSSL includes here
include/global.h:
Workaround for OPENSSL librar bug with defining crypt()
include/violite.h:
small fixes
libmysql/Makefile.am:
We need OpenSSL includes here
libmysql/Makefile.shared:
Yes, we need to compile more programs whtn --with-openssl is used
libmysql/libmysql.c:
Make it work! (openssl)
libmysql_r/Makefile.am:
We need OpenSSL includes here
sql/mysqld.cc:
Memory was not freed before
sql/sql_parse.cc:
fix
vio/Makefile.am:
Added testprogram compilation and openssl libraries linking
vio/viossl.c:
Cleanups, fixes, etc...
vio/viosslfactories.c:
Copyright was missing. Fixed renamed macros for newer OpenSSL
vio/viotest-ssl.c:
Made testprogram work again
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted