-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.0 Makefile.am: Auto merged client/mysqladmin.cc: Auto merged configure.in: Auto merged include/my_global.h: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_select.cc: Auto merged
9b512475