mirror of
https://github.com/MariaDB/server.git
synced 2025-05-16 03:24:47 +03:00
into mysql.com:/home/jimw/my/mysql-5.1-clean mysql-test/t/alter_table.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/table.cc: Auto merged mysql-test/r/show_check.result: Resolve conflict sql/authors.h: Resolve conflicts, update replication/backup developers