-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.0 sql/handler.cc: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
5c1b91f1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0 sql/handler.cc: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged