- 22 Sep, 2007 1 commit
-
-
unknown authored
into alf.(none):/src/bug15327/my50-bug15327 win/configure.js: Auto merged
-
- 21 Sep, 2007 5 commits
-
-
unknown authored
disconnects when test servers are put under load
-
unknown authored
make sure that if builder configured with a non-standard (!= 3306) default TCP port that value actually gets used throughout. win/configure.js: Bug #15327: configure: --with-tcp-port option being partially ignored If MYSQL_TCP_PORT defaulted in configure (factory default 3306 at the time of this writing), set MYSQL_TCP_PORT to factory default, then clear factory default after. That way, we lose no information, and we can distinguish between "defaulted" and the pathological case "builder specifically configured a port that coincides with factory default." This can in theory happen if builder configures and builds several servers from a script (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326). Not all that probable, but much preferable to having more "magic" happen in the server when we can solve this without any guesswork.
-
unknown authored
- Increase default 'connect_timeout' value to 10 seconds sql/mysql_priv.h: Increase the default connect_timeout value to 10 seconds
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
- Add extra insert mysql-test/r/archive.result: Add an extra insert to guarantee that the delayed insert shows up in the table mysql-test/t/archive.test: Add an extra insert to guarantee that the delayed insert shows up in the table
-
- 15 Sep, 2007 1 commit
-
-
unknown authored
into mysql.com:/home/tnurnberg/15327/50-15327 client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged libmysql/libmysql.c: Auto merged mysql-test/Makefile.am: Auto merged scripts/Makefile.am: Auto merged sql/mysqld.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
- 13 Sep, 2007 1 commit
-
-
unknown authored
make sure that if builder configured with a non-standard (!= 3306) default TCP port that value actually gets used throughout. if they didn't configure a value, assume "use a sensible default", which will be read from /etc/services or, failing that, from the factory default. That makes the order of preference - command-line option - my.cnf, where applicable - $MYSQL_TCP_PORT environment variable - /etc/services (unless configured --with-tcp-port) - default port (--with-tcp-port=... or factory default) client/mysql.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysql_upgrade.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqladmin.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlbinlog.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlcheck.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqldump.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlimport.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlmanagerc.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear configure.in: Bug #15327: configure: --with-tcp-port option being partially ignored If MYSQL_TCP_PORT defaulted in configure (factory default 3306 at the time of this writing), set MYSQL_TCP_PORT to factory default, then clear factory default after. That way, we lose no information, and we can distinguish between "defaulted" and the pathological case "builder specifically configured a port that coincides with factory default." This can in theory happen if builder configures and builds several servers from a script (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326). Not all that probable, but much preferable to having more "magic" happen in the server when we can solve this without any guesswork. client/mysqlshow.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqltest.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear include/mysql_version.h.in: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) libmysql/libmysql.c: Bug #15327: configure: --with-tcp-port option being partially ignored initialize default tcp port for client, like so: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) - environment variable MYSQL_TCP_PORT overrides this default - command-line option overrides all of the above mysql-test/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) mysql-test/mysql-test-run-shell.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) netware/mysql_test_run.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time netware/mysqld_safe.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time scripts/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) scripts/mysql_config.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) scripts/mysql_fix_privilege_tables.sh: Bug #15327: configure: --with-tcp-port option being partially ignored clarifying notice only scripts/mysqld_safe-watch.sh: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time server-tools/instance-manager/priv.h: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time sql/mysqld.cc: Bug #15327: configure: --with-tcp-port option being partially ignored if builder specifically requested a default port, use that (even if it coincides with our factory default). only if they didn't do we check /etc/services (and, failing on that, fall back to the factory default of 3306). either default can be overridden by the environment variable MYSQL_TCP_PORT, which in turn can be overridden with command line options. tests/mysql_client_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear tests/ssl_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time tests/thread_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear
-
- 05 Sep, 2007 3 commits
-
-
unknown authored
into damien-katzs-computer.local:/Users/dkatz/50_udf_const sql/item_func.cc: Auto merged
-
unknown authored
into damien-katzs-computer.local:/Users/dkatz/mysql50 sql/sql_select.cc: Auto merged
-
unknown authored
Previously, UDF *_init functions were passed constant strings with erroneous lengths. The length came from the containing variable's size, not the length of the value itself. Now the *_init functions get the constant as a null terminated string with the correct length supplied too. mysql-test/r/udf.result: Test case to check constants passed UDFs. mysql-test/t/udf.test: Test case to check constants passed UDFs. sql/item_func.cc: UDF _init functions are now passed the length of the constants, rather than the max length of the var containing the constant. sql/udf_example.c: Added check_const_len functions. The check_const_len_init functions checks that the lengths of constants are correctly passed. sql/udf_example.def: Add new example functions to windows dll export list.
-
- 29 Aug, 2007 11 commits
-
-
unknown authored
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
'mysqld_wait_started' don't return prematurely because of an old pidfile
-
unknown authored
-
unknown authored
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_misc.pl: Auto merged
-
unknown authored
-
unknown authored
-
unknown authored
-
unknown authored
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
-
unknown authored
mysql-test/lib/mtr_misc.pl: Add function 'mtr_rmtree' it will try 'rmtree' and if that fails (most likely due to permission problems we will fun File::find to chmod all files and dirs to 0777 and then delete. mysql-test/mysql-test-run.pl: Use 'mtr_rmtree' in favour of 'rmtree'
-
- 28 Aug, 2007 9 commits
-
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
-
unknown authored
Fix typo, "next_con" -> "con" client/mysqltest.c: Reuse "find_connection_by_name" both from "do_close_connection" and "do_send_quit" Adjust alignment of comment Fix typo in "do_close_connection", it used the global variable "next_con" instead of local variable "con"
-
unknown authored
-
unknown authored
to perform this analyzis) client/mysqltest.c: Add function 'show_query' and use it to output some debug queries when "sync_with_master" has failed. mysql-test/mysql-test-run.pl: Move "analyze_testcase_failure" to mysqltest
-
unknown authored
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
-
unknown authored
- Merge sslaccept and sslconnect. - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has succeeded, this avoids having to revert anything and thus protects against "close_active_vio" in the middle. - Add some variance to the testcase mysql-test/t/rpl_ssl.test: Add some variance by running two selects before stopping the slave Check that number of records in t1 are equal on master and slave vio/viossl.c: Rewrite sslconnect and sslaccept to automically "reset" the vio to VIO_TYPE_SSL. Also use the fd from 'SSL_get_fd' to avoid setting vio->sd to -1, that previously occured when "close_active_vio" was called during connect/accept. Merge the two function since they were exactly the same except for one line. Update the DBUG printouts to be generic(i.e use peer instead of client/server).
-
unknown authored
- Fix bug#27265 - Support for fixing bug#18441 extra/yassl/include/openssl/crypto.h: Import patch yassl.diff extra/yassl/include/openssl/ssl.h: Import patch yassl.diff extra/yassl/include/yassl_int.hpp: Import patch yassl.diff extra/yassl/src/handshake.cpp: Import patch yassl.diff extra/yassl/src/socket_wrapper.cpp: Import patch yassl.diff extra/yassl/src/ssl.cpp: Import patch yassl.diff extra/yassl/src/yassl_int.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/coding.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/crypto.cpp: Import patch yassl.diff extra/yassl/include/openssl/des_old.h: Import patch yassl.diff extra/yassl/include/openssl/evp.h: Import patch yassl.diff extra/yassl/include/openssl/hmac.h: Import patch yassl.diff extra/yassl/include/openssl/objects.h: Import patch yassl.diff extra/yassl/include/openssl/sha.h: Import patch yassl.diff extra/yassl/include/openssl/prefix_ssl.h: Update prefixes
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 sql/sql_show.cc: Auto merged
-
- 27 Aug, 2007 4 commits
-
-
unknown authored
configure.in: adjust version number after 5.0.48 clone-off
-
unknown authored
- "mysql" and "mysqlcheck" should not read defaults file client/mysql_upgrade.c: Instruct "mysql" and "mysqlcheck" that is invoked by "mysql_upgrade" not to read defaults file, they should get all the parameters they need from mysql_upgrade(that read the default file)
-
unknown authored
into mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
-
unknown authored
- Chop off .libs/ part of path if running in non installed builddir using libtool client/mysql_upgrade.c: Chop off .libs part of path to avoid executing "non relinked" binaries that would use the system installed dynamic libraries instead of the newly built ones.
-
- 25 Aug, 2007 1 commit
-
-
unknown authored
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
-
- 24 Aug, 2007 4 commits
-
-
unknown authored
into trift2.:/MySQL/M50/push-5.0 netware/Makefile.am: Auto merged
-
unknown authored
1) Ensure "init_db.sql" and "test_db-sql" really get built. 2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories. netware/BUILD/compile-netware-END: Ensure the "*.def" files are built for NetWare. This is a backport of a 5.1 fix which may not be needed in 5.0 but cannot do any harm: the general "link_sources" step might fall victim to a cleanup which would be fatal just for NetWare, because of problems in the ordering of SUBDIR entries. netware/Makefile.am: 1) The scripts "init_db.sql" and "test_db.sql" must be built in the NetWare phase. 2) Use "basename", not sed.
-
unknown authored
'mtr_short_hostname' and 'mtr_full_hostname'
-
unknown authored
into mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
-