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

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines

Browse Source 
into  stella.local:/home2/mydev/mysql-5.1-bug31210
This commit is contained in:
istruewing@stella.local
2007-11-13 10:33:50 +01:00
parent f5d1d682bc edce8a63e2
commit 5f206cb372
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysqld/lib_sql.cc
View File

@ -581,6 +581,7 @@ void *create_embedded_thd(int client_flag)
fprintf(stderr,"store_globals failed.\n"); fprintf(stderr,"store_globals failed.\n");
goto err; goto err;
} }
lex_start(thd);
/* TODO - add init_connect command execution */ /* TODO - add init_connect command execution */

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

@ -3754,7 +3754,9 @@ sub mysqld_arguments ($$$$) {
# When mysqld is run by a root user(euid is 0), it will fail # When mysqld is run by a root user(euid is 0), it will fail
# to start unless we specify what user to run as. If not running # to start unless we specify what user to run as. If not running
# as root it will be ignored, see BUG#30630 # as root it will be ignored, see BUG#30630
if (!(grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt))) { my $euid= $>;
if (!$glob_win32 and $euid == 0 and
grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt) == 0) {
mtr_add_arg($args, "%s--user=root"); mtr_add_arg($args, "%s--user=root");
} }