summaryrefslogtreecommitdiff
path: root/mysys/my_static.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-19 21:45:18 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-19 21:45:18 +0200
commit76f0b94bb0b2994d639353530c5b251d0f1a204b (patch)
tree9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysys/my_static.h
parent4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff)
parent5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff)
downloadmariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz
merge with 5.3
sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
Diffstat (limited to 'mysys/my_static.h')
-rw-r--r--mysys/my_static.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_static.h b/mysys/my_static.h
index 7fde15ff133..0f1cd34a04e 100644
--- a/mysys/my_static.h
+++ b/mysys/my_static.h
@@ -43,8 +43,6 @@ extern uint my_once_extra;
extern struct st_my_file_info my_file_info_default[MY_NFILE];
-extern ulonglong query_performance_frequency, query_performance_offset;
-
C_MODE_END
#endif /* MYSYS_MY_STATIC_INCLUDED */