mirror of
https://github.com/MariaDB/server.git
synced 2025-08-27 13:04:36 +03:00
properly" with main tree. libmysql/libmysql.c: Auto merged sql-common/my_time.c: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/sql_prepare.cc: Auto merged tests/client_test.c: Manual merge.