mariadb/config
unknown 4cfc649d25 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1


configure.in:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/share/errmsg.txt:
  merge
2006-04-24 13:32:07 +03:00
..
ac-macros Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2006-04-24 13:32:07 +03:00