-
unknown authored
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0 sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_view.cc: Auto merged
8a84f4ef
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0 sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_view.cc: Auto merged