unknown c275fce7b4 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint ...

into  example.com:/work/bug22369-v2/my51


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/alter_table.test:
  manual merge

2006-12-04 18:31:24 +01:00

18 KiB

Raw Blame History

View Raw