database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mishka.local:/home/my/mysql-5.0
This commit is contained in:
unknown
2005-08-22 19:58:11 +03:00
parent 2e44fbb01b 0b4ec2fb42
commit a4892eafc4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/instance.h
View File

@@ -42,7 +42,7 @@ public:
void kill_instance(int signo); void kill_instance(int signo);
int is_crashed(); int is_crashed();
void set_crash_flag_n_wake_all(); void set_crash_flag_n_wake_all();
Instance_map *Instance::get_map(); Instance_map *get_map();
public: public:
enum { DEFAULT_SHUTDOWN_DELAY= 35 }; enum { DEFAULT_SHUTDOWN_DELAY= 35 };

5
sql/sql_list.h
View File

@@ -426,6 +426,11 @@ struct ilink
template <class T> class I_List_iterator; template <class T> class I_List_iterator;
/*
WARNING: copy constructor of this class does not create a usable
copy, as its members may point at each other.
*/
class base_ilist class base_ilist
{ {
public: public: