Merge mysqldev@production.mysql.com:my/mysql-5.1-release

into lmy004.:/work/mysql-5.1-release

Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release
c2330977 · unknown · 375615f7 · 05d44302 · c2330977
Commit c2330977 authored May 23, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

sql/event_scheduler.cc sql/event_scheduler.cc +9 -2

No files found.
--- a/sql/event_scheduler.cc
+++ b/sql/event_scheduler.cc
@@ -236,9 +236,16 @@
  about conditional variables used.
 */
+#ifdef __GNUC__
+#if __GNUC__ >= 2
+#define SCHED_FUNC __FUNCTION__
+#endif
+#else
+#define SCHED_FUNC "<unknown>"
+#endif
-#define LOCK_SCHEDULER_DATA()   lock_data(__FUNCTION__,__LINE__)
+#define LOCK_SCHEDULER_DATA()   lock_data(SCHED_FUNC, __LINE__)
-#define UNLOCK_SCHEDULER_DATA() unlock_data(__FUNCTION__,__LINE__)
+#define UNLOCK_SCHEDULER_DATA() unlock_data(SCHED_FUNC, __LINE__)
 #ifndef DBUG_OFF