database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

test suite fixes

Browse Source 
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
This commit is contained in:
Sergei Golubchik
2013-01-23 16:22:27 +01:00
parent c71fad9983
commit 675c1b378a
5 changed files with 117 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmysqld/lib_sql.cc
View File

@ -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;
}