-
unknown authored
configure.in: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/information_schema_db.result: Auto merged mysql-test/r/query_cache_notembedded.result: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/query_cache_notembedded.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged sql/ha_innodb.cc: manual merge sql/sql_insert.cc: manual merge
a0826252