mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-30 04:26:45 +03:00 
			
		
		
		
	Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql mysql-test/r/type_float.result: Auto merged
This commit is contained in: