summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-03-26 14:11:17 +0200
committerunknown <monty@mashka.mysql.fi>2003-03-26 14:11:17 +0200
commit10b0edf3990ea4e72d2c8ef297394d6b3da35965 (patch)
tree5f1fe00efaf406cbeecaeaa7b508bd5cb4f7536b /sql
parent044b0b258804522ead46ae8af3b5d170d9d80ceb (diff)
downloadmariadb-git-10b0edf3990ea4e72d2c8ef297394d6b3da35965.tar.gz
Fix for glibc with small stack size (fixes bug when running crash-me)
sql-bench/limits/mysql.cfg: Update to new crash me
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e22d9b1dc67..19b7ef1ad62 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2104,10 +2104,11 @@ int main(int argc, char **argv)
/* Retrieve used stack size; Needed for checking stack overflows */
size_t stack_size;
pthread_attr_getstacksize(&connection_attrib, &stack_size);
- if (global_system_variables.log_warnings && stack_size != thread_stack)
+ if (stack_size != thread_stack)
{
- sql_print_error("Warning: Asked for %ld thread stack, but got %ld",
- thread_stack, stack_size);
+ if (global_system_variables.log_warnings)
+ sql_print_error("Warning: Asked for %ld thread stack, but got %ld",
+ thread_stack, stack_size);
thread_stack= stack_size;
}
}