diff options
| author | unknown <guilhem@mysql.com> | 2004-06-03 23:19:01 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-03 23:19:01 +0200 |
| commit | 948903fc4f47af2cf328424931a64030bec44442 (patch) | |
| tree | 7167f46c01fca0ac351957979f203eb7255612be /sql/sql_class.h | |
| parent | 0f7a9f61023d97b60286ed7b72f27a9fb343f083 (diff) | |
| parent | 934bb37d39b7c18c8d80eccdd914dc08f988c646 (diff) | |
| download | mariadb-git-948903fc4f47af2cf328424931a64030bec44442.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index a3e398dc1d6..26f41b2912f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -801,7 +801,7 @@ public: /* scramble - random string sent to client on handshake */ char scramble[SCRAMBLE_LENGTH+1]; - bool slave_thread; + bool slave_thread, one_shot_set; bool locked, some_tables_deleted; bool last_cuted_field; bool no_errors, password, is_fatal_error; |