unknown f83f742b55 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint ...

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


include/config-netware.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
configure.in:
  SCCS merged
sql/sql_base.cc:
  SCCS merged

2006-09-05 13:49:24 -04:00

72 KiB

Raw Blame History

View Raw