diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-04 15:17:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-04 15:17:00 +0200 |
| commit | 2ab6c508fe7f55bf268266e793af58c5d9e09336 (patch) | |
| tree | 7af6ebdabf59a6034b5eb38a17731234d913c063 /mysql-test/r/mysqltest.result | |
| parent | 9ff5060ebfa1fcdddfd04a9ca510fc9281ac96d3 (diff) | |
| parent | 0d320a0ea1b6118746ded588d84fb975decb6c6f (diff) | |
| download | mariadb-git-2ab6c508fe7f55bf268266e793af58c5d9e09336.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/r/mysqltest.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 0188fe87bbd..33b8f4498ab 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -277,6 +277,9 @@ let $A = changed value of A; # Content of $B is: initial value of B let $B = changed value of B; # Content of $A is: changed value of A +var2: content of variable 1 +var3: content of variable 1 content of variable 1 +length of var3 is longer than 0 mysqltest: At line 1: Missing required argument 'filename' to command 'source' mysqltest: At line 1: Could not open file ./non_existingFile mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep |