libtabula

Check-in [22bc9089e2]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Build fix for MySQL 5.1: new MYSQL_TYPE_* constants added to squish compiler warnings about unhandled cases with MariaDB 10 don't exist in older C libraries, so they have to be conditional.
Timelines: family | ancestors | descendants | both | mysql-type-info
Files: files | file ages | folders
SHA1: 22bc9089e2d1fb275336aba425a59837db91df0f
User & Date: etr 2015-08-06 23:09:03
Context
2015-08-06
23:17
The CMake build system now detects the need for -lpthread and such, and auto-selects between libmysqlclient[_r] options based on whether a threading library was found. That is, we're choosing to drop the MySQL++ --enable-thread-check build feature and just enable thread awareness if it's possible here. check-in: 02d5267584 user: etr tags: mysql-type-info
23:09
Build fix for MySQL 5.1: new MYSQL_TYPE_* constants added to squish compiler warnings about unhandled cases with MariaDB 10 don't exist in older C libraries, so they have to be conditional. check-in: 22bc9089e2 user: etr tags: mysql-type-info
07:19
Genericized the MySQL type map stuff some more so that we can move most of it back up from the driver layer into the user-facing layer. (FieldType and such.) This change is the first that lets this branch compile, though not link.

This addresses [359c32123a] check-in: baaa9e942e user: etr tags: mysql-type-info

Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/mysql/ft.cpp.

64
65
66
67
68
69
70

71

72
73
74

75
76
77

78
79
80
81
82
83
84
#if MYSQL_VERSION_ID >= 50000
		case MYSQL_TYPE_NEWDATE:
#endif
		case MYSQL_TYPE_YEAR:
			return ft_date;

		case MYSQL_TYPE_TIME:

		case MYSQL_TYPE_TIME2:

			return ft_time;

		case MYSQL_TYPE_DATETIME:

		case MYSQL_TYPE_DATETIME2:
		case MYSQL_TYPE_TIMESTAMP:
		case MYSQL_TYPE_TIMESTAMP2:

			return ft_datetime;

		case MYSQL_TYPE_ENUM:
			return ft_enum;

		case MYSQL_TYPE_SET:
			return ft_set;







>

>



>
|
|

>







64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
#if MYSQL_VERSION_ID >= 50000
		case MYSQL_TYPE_NEWDATE:
#endif
		case MYSQL_TYPE_YEAR:
			return ft_date;

		case MYSQL_TYPE_TIME:
#if defined(MYSQL_TYPE_TIME2)
		case MYSQL_TYPE_TIME2:
#endif
			return ft_time;

		case MYSQL_TYPE_DATETIME:
		case MYSQL_TYPE_TIMESTAMP:
#if defined(MYSQL_TYPE_DATETIME2)
		case MYSQL_TYPE_DATETIME2:
		case MYSQL_TYPE_TIMESTAMP2:
#endif
			return ft_datetime;

		case MYSQL_TYPE_ENUM:
			return ft_enum;

		case MYSQL_TYPE_SET:
			return ft_set;