diff options
| author | unknown <kent/mysqldev@mysql.com/production.mysql.com> | 2007-09-07 13:30:42 +0200 |
|---|---|---|
| committer | unknown <kent/mysqldev@mysql.com/production.mysql.com> | 2007-09-07 13:30:42 +0200 |
| commit | aff30b40cd4e8aebfe134be74c57bf6bdef6120e (patch) | |
| tree | d27e993df24670408198e0e0d96ce176d8198b1f | |
| parent | f571ae9bf2ac1390364b476c2b5b81123334b769 (diff) | |
| download | mariadb-git-aff30b40cd4e8aebfe134be74c57bf6bdef6120e.tar.gz | |
ha_partition.cc, listener.h, listener.cc, ha_partition.h:
Initiate static const outside class definition
server-tools/instance-manager/listener.cc:
Initiate static const outside class definition
server-tools/instance-manager/listener.h:
Initiate static const outside class definition
sql/ha_partition.cc:
Initiate static const outside class definition
sql/ha_partition.h:
Initiate static const outside class definition
| -rw-r--r-- | server-tools/instance-manager/listener.cc | 1 | ||||
| -rw-r--r-- | server-tools/instance-manager/listener.h | 2 | ||||
| -rw-r--r-- | sql/ha_partition.cc | 2 | ||||
| -rw-r--r-- | sql/ha_partition.h | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc index e68ba2fe8ce..4d8a33e7db1 100644 --- a/server-tools/instance-manager/listener.cc +++ b/server-tools/instance-manager/listener.cc @@ -56,6 +56,7 @@ static void set_no_inherit(int socket) #endif } +const int Listener::LISTEN_BACK_LOG_SIZE= 5; /* standard backlog size */ Listener::Listener(Thread_registry *thread_registry_arg, User_map *user_map_arg) diff --git a/server-tools/instance-manager/listener.h b/server-tools/instance-manager/listener.h index 21427cfe185..964fb361fb5 100644 --- a/server-tools/instance-manager/listener.h +++ b/server-tools/instance-manager/listener.h @@ -39,7 +39,7 @@ protected: virtual void run(); private: - static const int LISTEN_BACK_LOG_SIZE= 5; /* standard backlog size */ + static const int LISTEN_BACK_LOG_SIZE; private: Thread_info thread_info; diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index b744c3952ff..580e28e3ee2 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -145,6 +145,8 @@ static uint alter_table_flags(uint flags __attribute__((unused))) HA_FAST_CHANGE_PARTITION); } +const uint ha_partition::NO_CURRENT_PART_ID= 0xFFFFFFFF; + /* Constructor method diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 434d90a4487..4d3b76ac68a 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -468,7 +468,7 @@ public: virtual int reset(void); private: - static const uint NO_CURRENT_PART_ID= 0xFFFFFFFF; + static const uint NO_CURRENT_PART_ID; int loop_extra(enum ha_extra_function operation); void late_extra_cache(uint partition_id); void late_extra_no_cache(uint partition_id); |