diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-05-02 19:42:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-05-02 19:42:34 +0200 |
| commit | 390b57f2ac568e54429a099abe1bf3a49abe3d27 (patch) | |
| tree | 995e2746501fc9ed2e5051533c475dc88ac48b4c /dbug | |
| parent | ca0939d57d8b891080c27bf1aa56e297213249b9 (diff) | |
| parent | 6add5be771fc955d2f22b1eb0f14596a5bac1ca0 (diff) | |
| download | mariadb-git-390b57f2ac568e54429a099abe1bf3a49abe3d27.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-bugteam
client/mysqltest.c:
Auto merged
dbug/dbug.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
client/mysql_upgrade.c:
SCCS merged
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/dbug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 666ab2b3e3c..1cebbbcf72a 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -493,7 +493,7 @@ static void DbugParse(CODE_STATE *cs, const char *control) } end= DbugStrTok(control); - while (1) + while (control < end) { int c, sign= (*control == '+') ? 1 : (*control == '-') ? -1 : 0; if (sign) control++; |