diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 10:12:38 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-10-20 10:12:38 +0200 |
| commit | 951243708c3e6ccd18153abdc082583664c007e7 (patch) | |
| tree | 2e80a4d9713e0245eb5222b0989f5b0d0c91e07a /mysql-test/r/mix2_myisam.result | |
| parent | fcbf1509e22e9c27910d5beacb6d105e81d2a6b3 (diff) | |
| download | mariadb-git-951243708c3e6ccd18153abdc082583664c007e7.tar.gz | |
sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result:
merge fixes
mysql-test/r/mix2_myisam.result:
merge fixes
mysql-test/r/type_decimal.result:
merge fixes
sql/sql_rename.cc:
merge fixes
sql/sql_table.cc:
merge fixes
Diffstat (limited to 'mysql-test/r/mix2_myisam.result')
| -rw-r--r-- | mysql-test/r/mix2_myisam.result | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/mix2_myisam.result b/mysql-test/r/mix2_myisam.result index 9a7d71820f8..45b4784251a 100644 --- a/mysql-test/r/mix2_myisam.result +++ b/mysql-test/r/mix2_myisam.result @@ -1611,15 +1611,15 @@ i 10 select sql_big_result v,count(c) from t1 group by v limit 10; v count(c) a 1 -a 10 -b 10 -c 10 -d 10 -e 10 -f 10 -g 10 +a 10 +b 10 +c 10 +d 10 +e 10 +f 10 +g 10 h 10 -i 10 +i 10 select c,count(*) from t1 group by c limit 10; c count(*) a 1 |