mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

10.0-monty merge

Browse source 
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
This commit is contained in:
Sergei Golubchik 2013-07-21 16:39:19 +02:00
commit b7b5f6f1ab
1378 changed files with 124559 additions and 47549 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugin/query_response_time/query_response_time.h
View file

@ -44,11 +44,11 @@
#define QRT_DEFAULT_BASE 10
#define QRT_TIME_STRING_LENGTH \
max( (QRT_TIME_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TIME_STRING_NEGATIVE_POWER_LENGTH*/), \
MY_MAX( (QRT_TIME_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TIME_STRING_NEGATIVE_POWER_LENGTH*/), \
(sizeof(QRT_TIME_OVERFLOW) - 1) )
#define QRT_TOTAL_STRING_LENGTH \
max( (QRT_TOTAL_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TOTAL_STRING_NEGATIVE_POWER_LENGTH*/), \
MY_MAX( (QRT_TOTAL_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TOTAL_STRING_NEGATIVE_POWER_LENGTH*/), \
(sizeof(QRT_TIME_OVERFLOW) - 1) )
extern ST_SCHEMA_TABLE query_response_time_table;