diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
| commit | 4f435bddfd44d40999f88685c61cc04e319d8d6c (patch) | |
| tree | f9d0655a0d901b87f918a736741144b502cba3f6 /mysql-test/std_data | |
| parent | 8c2bcdf85ff753bceeb5b235f3605e348e6f9e1d (diff) | |
| parent | 6ca4ca7d37fed3b3da18666768de6a2f8c34bc7b (diff) | |
| download | mariadb-git-4f435bddfd44d40999f88685c61cc04e319d8d6c.tar.gz | |
5.3 merge
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/bug887051.txt | 2 | ||||
| -rw-r--r-- | mysql-test/std_data/checkDBI_DBD-mysql.pl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/std_data/bug887051.txt b/mysql-test/std_data/bug887051.txt new file mode 100644 index 00000000000..a1df5f35bb1 --- /dev/null +++ b/mysql-test/std_data/bug887051.txt @@ -0,0 +1,2 @@ +saved1 +saved2 diff --git a/mysql-test/std_data/checkDBI_DBD-mysql.pl b/mysql-test/std_data/checkDBI_DBD-mysql.pl index f001e471081..d62d2f8bfc0 100644 --- a/mysql-test/std_data/checkDBI_DBD-mysql.pl +++ b/mysql-test/std_data/checkDBI_DBD-mysql.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, Oracle and/or its affiliates # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public |