mirror of
https://github.com/MariaDB/server.git
synced 2025-08-27 13:04:36 +03:00
into labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel libmysql/libmysql.c: Auto merged mysql-test/r/innodb_mysql.result: Manual merge from main 5.1 to 5.1-marvel. mysql-test/t/innodb_mysql.test: Manual merge from main 5.1 to 5.1-marvel.