1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  shellback.(none):/home/msvensson/mysql/my51-bug30843


BitKeeper/deleted/.del-configure.js:
  Auto merged
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
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.def:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/udf_example.c:
  Merge 5.0->5.1
This commit is contained in:
unknown 2007-09-22 09:51:54 +02:00
commit b1a33149a7
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/mysql-test-run.pl
View File

@ -3742,6 +3742,11 @@ sub mysqld_arguments ($$$$) {
mtr_add_arg($args, "%s--language=%s", $prefix, $path_language); mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix); mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
# Increase default connect_timeout to avoid intermittent
# disconnects when test servers are put under load
# see BUG#28359
mtr_add_arg($args, "%s--connect-timeout=60", $prefix);
if ( $opt_valgrind_mysqld ) if ( $opt_valgrind_mysqld )
{ {
mtr_add_arg($args, "%s--skip-safemalloc", $prefix); mtr_add_arg($args, "%s--skip-safemalloc", $prefix);

7
sql/mysql_priv.h
View File

@ -327,8 +327,13 @@ protected:
#define PRECISION_FOR_DOUBLE 53 #define PRECISION_FOR_DOUBLE 53
#define PRECISION_FOR_FLOAT 24 #define PRECISION_FOR_FLOAT 24
/*
Default time to wait before aborting a new client connection
that does not respond to "initial server greeting" timely
*/
#define CONNECT_TIMEOUT 10
/* The following can also be changed from the command line */ /* The following can also be changed from the command line */
#define CONNECT_TIMEOUT 5 // Do not wait long for connect
#define DEFAULT_CONCURRENCY 10 #define DEFAULT_CONCURRENCY 10
#define DELAYED_LIMIT 100 /* pause after xxx inserts */ #define DELAYED_LIMIT 100 /* pause after xxx inserts */
#define DELAYED_QUEUE_SIZE 1000 #define DELAYED_QUEUE_SIZE 1000

4
sql/udf_example.c
View File

@ -1106,11 +1106,12 @@ char * is_const(UDF_INIT *initid, UDF_ARGS *args __attribute__((unused)),
} }
my_bool check_const_len_init(UDF_INIT *initid, UDF_ARGS *args, char *message) my_bool check_const_len_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
{ {
if (args->arg_count != 1) if (args->arg_count != 1)
{ {
strmov(message, "IS_CONST accepts only one argument"); strmov(message, "CHECK_CONST_LEN accepts only one argument");
return 1; return 1;
} }
if (args->args[0] == 0) if (args->args[0] == 0)
@ -1140,5 +1141,4 @@ char * check_const_len(UDF_INIT *initid, UDF_ARGS *args __attribute__((unused)),
} }
#endif /* HAVE_DLOPEN */ #endif /* HAVE_DLOPEN */