Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
f4f81344
Commit
f4f81344
authored
6 years ago
by
Bertrand Bellenot
Browse files
Options
Downloads
Patches
Plain Diff
From Sergey: Try to fix compilation error
parent
4b5e7630
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sql/mysql/inc/TMySQLStatement.h
+1
-1
1 addition, 1 deletion
sql/mysql/inc/TMySQLStatement.h
with
1 addition
and
1 deletion
sql/mysql/inc/TMySQLStatement.h
+
1
−
1
View file @
f4f81344
...
@@ -25,7 +25,7 @@ typedef struct { int dummy; } MYSQL_BIND;
...
@@ -25,7 +25,7 @@ typedef struct { int dummy; } MYSQL_BIND;
// MariaDB is fork of MySQL and still include definition of my_bool
// MariaDB is fork of MySQL and still include definition of my_bool
// MariaDB major version is 10, therefore it confuses version ID here
// MariaDB major version is 10, therefore it confuses version ID here
#ifndef MARIADB_VERSION_ID
#ifndef MARIADB_VERSION_ID
#if MYSQL_VERSION_ID > 80000
#if MYSQL_VERSION_ID > 80000
&& MYSQL_VERSION_ID < 100000
typedef
bool
my_bool
;
typedef
bool
my_bool
;
#endif
#endif
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment