Add d/p/14_mariad to fix FTBFS with MariaDB 10.3. (Closes: #919375)
Taken from upstream
This commit is contained in:
		
							parent
							
								
									15f2a2be74
								
							
						
					
					
						commit
						73f22736fc
					
				
					 2 changed files with 28 additions and 0 deletions
				
			
		
							
								
								
									
										27
									
								
								debian/patches/14_mariadb
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								debian/patches/14_mariadb
									
										
									
									
										vendored
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,27 @@
 | 
			
		|||
From 399cc141526ee77e1befce469f1fab40645f299d Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Bernard Spil <Sp1l@users.noreply.github.com>
 | 
			
		||||
Date: Mon, 6 Nov 2017 17:31:44 +0100
 | 
			
		||||
Subject: [PATCH] Fix build issue with MariaDB 10.2
 | 
			
		||||
Bug-Debian: https://bugs.debian.org/919395
 | 
			
		||||
 | 
			
		||||
As of 10.2 MariaDB no longer defines MYSQL_PORT.
 | 
			
		||||
---
 | 
			
		||||
 plugins/common.h | 5 +++++
 | 
			
		||||
 1 file changed, 5 insertions(+)
 | 
			
		||||
 | 
			
		||||
diff --git a/plugins/common.h b/plugins/common.h
 | 
			
		||||
index 8719b502..6bf4fca4 100644
 | 
			
		||||
--- a/plugins/common.h
 | 
			
		||||
+++ b/plugins/common.h
 | 
			
		||||
@@ -174,6 +174,11 @@
 | 
			
		||||
  *
 | 
			
		||||
  */
 | 
			
		||||
 
 | 
			
		||||
+/* MariaDB 10.2 client does not set MYSQL_PORT */
 | 
			
		||||
+#ifndef MYSQL_PORT
 | 
			
		||||
+#  define MYSQL_PORT 3306
 | 
			
		||||
+#endif
 | 
			
		||||
+
 | 
			
		||||
 enum {
 | 
			
		||||
 	OK = 0,
 | 
			
		||||
 	ERROR = -1
 | 
			
		||||
							
								
								
									
										1
									
								
								debian/patches/series
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/patches/series
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -4,3 +4,4 @@
 | 
			
		|||
11_check_dhcp_MSG_PEAK
 | 
			
		||||
12_check_apt_only_crit
 | 
			
		||||
13_check_apt_list_packages
 | 
			
		||||
14_mariadb
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue