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 | 87b91752f9951aae73d03b27088d8aca0b6b2b30 (patch) | |
| tree | f67aca9005dbfcfdab08177126a34a2379b71d6b /dbug/dbug.c | |
| parent | ebe356cb323fe30c1505842e5896f6d2bcb93fed (diff) | |
| parent | 4776282bede4da8cceeee1ce450310b281e34af9 (diff) | |
| download | mariadb-git-87b91752f9951aae73d03b27088d8aca0b6b2b30.tar.gz | |
Merge from mysql-5.1-bugteam to mysql-5.5-bugteam
No conflicts
Diffstat (limited to 'dbug/dbug.c')
| -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); } |