database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-06 13:10:12 +03:00
Code Activity
Files
27ef2fda985a1cb55166d77d3d973704ba57e30f
mariadb/mysql-test/t/skip_name_resolve.test
Alexey Kopytov 3df8e88dd8 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 
Conflicts:

Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
Text conflict in sql/log.cc
Text conflict in sql/set_var.cc
Text conflict in sql/sql_class.cc
2010-04-03 21:35:51 +04:00

1.6 KiB
Raw Blame History

View Raw
View Git Blame Copy Permalink