diff options
| author | Sergei Golubchik <serg@mysql.com> | 2008-08-08 13:11:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mysql.com> | 2008-08-08 13:11:27 +0200 |
| commit | e2219ec965a80b2034d9debcbf12d3e73a684d89 (patch) | |
| tree | b3536b97676a1a4775570820a6ff59a628ed4e99 /sql-common | |
| parent | f8c1059cbf62e95d2684fdf8b9badc398f845173 (diff) | |
| download | mariadb-git-e2219ec965a80b2034d9debcbf12d3e73a684d89.tar.gz | |
wt_thd_lazy_init(), per-thread deadlock search depths and timeouts
mysys/array.c:
lazy alloc in dynamic array
sql-common/client.c:
for dynamic array, specify init_alloc==alloc_increment explicitly
sql/mysqld.cc:
per-thread deadlock search depths and timeouts
sql/set_var.cc:
per-thread deadlock search depths and timeouts
sql/sql_class.h:
per-thread deadlock search depths and timeouts
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 63c746a3f5a..51744484623 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -996,7 +996,7 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd) { options->init_commands= (DYNAMIC_ARRAY*)my_malloc(sizeof(DYNAMIC_ARRAY), MYF(MY_WME)); - init_dynamic_array(options->init_commands,sizeof(char*),0,5 CALLER_INFO); + init_dynamic_array(options->init_commands,sizeof(char*),5,5 CALLER_INFO); } if (!(tmp= my_strdup(cmd,MYF(MY_WME))) || |