diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-19 10:30:26 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-19 10:30:26 +0200 |
| commit | 772385313e83bb0c28af7bd346a36c1d8066bd21 (patch) | |
| tree | f67aca9005dbfcfdab08177126a34a2379b71d6b /dbug | |
| parent | d96afd26c9cd859da65577871a3186288b2edf16 (diff) | |
| parent | 6da8a65bf0ebeb74f8fdd9a83c8650745e811aaa (diff) | |
| download | mariadb-git-772385313e83bb0c28af7bd346a36c1d8066bd21.tar.gz | |
Merge from mysql-5.1-bugteam to mysql-5.5-bugteam
No conflicts
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/dbug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index c6e28b62e34..df26e2ee8ef 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -905,6 +905,7 @@ void _db_set_init_(const char *control) CODE_STATE tmp_cs; bzero((uchar*) &tmp_cs, sizeof(tmp_cs)); tmp_cs.stack= &init_settings; + tmp_cs.process= db_process ? db_process : "dbug"; DbugParse(&tmp_cs, control); } |