diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-15 05:12:21 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-15 05:12:21 +0200 |
| commit | 63e4dec2446382bf0331d2c483daee665064b925 (patch) | |
| tree | 5b07ad850f8dba78d186135337dd5a151d18a2b8 /mysql-test/r | |
| parent | 6a5f89c9b190b0f26fc0cb12595126cba2659f32 (diff) | |
| parent | f8b4629cf728072b230159718994f585145b4ce2 (diff) | |
| download | mariadb-git-63e4dec2446382bf0331d2c483daee665064b925.tar.gz | |
Merge with 3.23.47
extra/resolve_stack_dump.c:
Auto merged
include/my_bitmap.h:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
mysql-test/t/rpl_get_lock.test:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/rpl_skip_error.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_skip_error.result b/mysql-test/r/rpl_skip_error.result new file mode 100644 index 00000000000..f85b057eefa --- /dev/null +++ b/mysql-test/r/rpl_skip_error.result @@ -0,0 +1,4 @@ +n +1 +2 +3 |