Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt


mysql-test/t/view_grant.test:
  Auto merged
sql/table.cc:
  Auto merged
This commit is contained in:
unknown 2006-11-29 15:21:28 +01:00
commit 90578ce767
214 changed files with 1465 additions and 1115 deletions

View file

@ -1,3 +1,4 @@
DROP TABLE IF EXISTS t1;
SHOW COLLATION LIKE 'cp1250_czech_cs';
Collation Charset Id Default Compiled Sortlen
cp1250_czech_cs cp1250 34 Yes 2