1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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
This commit is contained in:
unknown
2006-10-20 10:12:38 +02:00
parent fcbf1509e2
commit 951243708c
4 changed files with 21 additions and 18 deletions

View File

@ -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