Fix compiler error

vaintroub · vaintroub · commit d7c35a999203 · 2017-03-23T19:28:36.000Z
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -1707,7 +1707,7 @@ thd_has_edited_nontrans_tables(
 
 /* Return high resolution timestamp for the start of the current query */
 UNIV_INTERN
-ib_uint64_t
+unsigned long long
 thd_query_start_micro(
 	const THD*	thd)	/*!< in: thread handle */
 {
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
@@ -1983,7 +1983,7 @@ thd_has_edited_nontrans_tables(
 
 /* Return high resolution timestamp for the start of the current query */
 UNIV_INTERN
-ib_uint64_t
+unsigned long long
 thd_query_start_micro(
 	const THD*	thd)	/*!< in: thread handle */
 {

Original file line number	Diff line number	Diff line change
`@@ -1707,7 +1707,7 @@ thd_has_edited_nontrans_tables(`
`1707`	`1707`
`1708`	`1708`	`/* Return high resolution timestamp for the start of the current query */`
`1709`	`1709`	`UNIV_INTERN`
`1710`		`-ib_uint64_t`
	`1710`	`+unsigned long long`
`1711`	`1711`	`thd_query_start_micro(`
`1712`	`1712`	`const THD* thd) /!< in: thread handle /`
`1713`	`1713`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1983,7 +1983,7 @@ thd_has_edited_nontrans_tables(`
`1983`	`1983`
`1984`	`1984`	`/* Return high resolution timestamp for the start of the current query */`
`1985`	`1985`	`UNIV_INTERN`
`1986`		`-ib_uint64_t`
	`1986`	`+unsigned long long`
`1987`	`1987`	`thd_query_start_micro(`
`1988`	`1988`	`const THD* thd) /!< in: thread handle /`
`1989`	`1989`	`{`