mirror of
https://github.com/MariaDB/server.git
synced 2025-11-10 23:02:54 +03:00
into mysql.com:/home/jimw/my/mysql-5.0-clean sql/item_func.cc: Auto merged sql/set_var.cc: Auto merged mysql-test/r/variables.result: Resolve conflict mysql-test/t/variables.test: Resolve conflict
15 KiB
15 KiB