diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:24:31 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:24:31 +0200 |
| commit | 1ac0bce36e5bf2136cedb1ce1da949f53cce4404 (patch) | |
| tree | 7b81481b201c4e64aaa4a70411d992e0fac2289d /dbug | |
| parent | 3b071bad1981a12e76769cbfc31b62fbd7362372 (diff) | |
| parent | 65e8506ca9d03967191b6ed207cf107d311f7f99 (diff) | |
| download | mariadb-git-1ac0bce36e5bf2136cedb1ce1da949f53cce4404.tar.gz | |
Merge branch '10.4' into 10.5mariadb-10.5.17
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/dbug.c | 2 | ||||
| -rw-r--r-- | dbug/user.r | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 169dd226419..17567585bfd 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -55,7 +55,7 @@ * * Michael Widenius: * DBUG_DUMP - To dump a block of memory. - * PUSH_FLAG "O" - To be used insted of "o" if we + * PUSH_FLAG "O" - To be used instead of "o" if we * want flushing after each write * PUSH_FLAG "A" - as 'O', but we will append to the out file instead * of creating a new one. diff --git a/dbug/user.r b/dbug/user.r index 8d8a9ce6910..9a48ba3bcb2 100644 --- a/dbug/user.r +++ b/dbug/user.r @@ -847,7 +847,7 @@ EX:\fC Unlocks DBUG_FILE stream, that was locked with a DBUG_LOCK_FILE. .LI DBUG_ASSERT\ This macro just does a regular assert(). The difference is that it will be -disabled by DBUG_OFF togeher with the +disabled by DBUG_OFF together with the .I dbug library. So there will be no need to disable asserts separately with NDEBUG. .SP 1 @@ -1115,7 +1115,7 @@ will usually have problems using the standard package. The most common problem is multiply allocated memory. .SP 2 -.\" .DE nroff dident like this. davida 900108 +.\" .DE nroff didn't like this. davida 900108 .CS .\" vim:filetype=nroff |