diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:22:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:22:27 +0100 |
| commit | 675c1b378a90b4e607d8500a1a6f0c0c743b977d (patch) | |
| tree | 12d801d4bb749fad9f866f7cab4d7ad58b4e6d8e /libmysqld | |
| parent | c71fad9983b4a3c6e0d9e9eca02dadfd923ddbbb (diff) | |
| download | mariadb-git-675c1b378a90b4e607d8500a1a6f0c0c743b977d.tar.gz | |
test suite fixes
libmysqld/lib_sql.cc:
* don't overwrite my_progname in embedded
* this memroot is sometimes freed by the caller, outside of THD context
mysql-test/t/user_var.test:
typo: duplicate line
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 291ce336046..5332003885d 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -520,7 +520,8 @@ int init_embedded_server(int argc, char **argv, char **groups) if (!groups) groups= (char**) fake_groups; - my_progname= (char *)"mysql_embedded"; + if (!my_progname) + my_progname= (char *)"mysql_embedded"; /* Perform basic logger initialization logger. Should be called after @@ -907,7 +908,7 @@ int Protocol::begin_dataset() return 1; alloc= &data->alloc; /* Assume rowlength < 8192 */ - init_alloc_root(alloc, 8192, 0, MYF(MY_THREAD_SPECIFIC)); + init_alloc_root(alloc, 8192, 0, MYF(0)); alloc->min_malloc= sizeof(MYSQL_ROWS); return 0; } |