← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/options.h

  • Committer: Prafulla Tekawade
  • Date: 2010-07-18 03:36:32 UTC
  • mto: (1662.1.4 rollup)
  • mto: This revision was merged to the branch mainline in revision 1664.
  • Revision ID: prafulla_t@users.sourceforge.net-20100718033632-p7q6qtgliqbhe38p
Fix for Bug 592444

There were two problems:
o. In greedy_search optimizer method, best_extension_by_limited search
   maintains join embedding(nestedness) of tables added so far, so that 
   correct(valid)  join order is selected
   These are requirements from nested outer join executioner.
   The problem was, embedding_map was not correctly updated when a table 
   is added to optimal plan outside best_extension_by_limited search, 
   by greedy_search method. We need to update join->cur_embedding_map
   correctly here so that execution plan for other tables get
   generated.
   Invoked checked_interleaving_with_nj from greedy_search on the
   best_table selected. Fixed its prototype to take only one JoinTab
   This is same as mysql 5.1 source tree.
o. The other problem was, join->cur_embedding_map was not restored correctly
   when a table is added to the optimal plan to reflect the current embedding 
   map. 
   Taken good documented method restore_prev_nj_state which restores 
   cur_embedding_map from mysql 5.1 source tree and modified it for drizzled 
   code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/options.h
20
20
#ifndef PLUGIN_MYSQL_PROTOCOL_OPTIONS_H
21
21
#define PLUGIN_MYSQL_PROTOCOL_OPTIONS_H
22
22
 
23
 
namespace drizzle_plugin
24
 
{
 
23
#ifdef  __cplusplus
 
24
extern "C" {
 
25
#endif
25
26
 
26
27
enum drizzle_option
27
28
{
71
72
};
72
73
 
73
74
 
 
75
#ifdef  __cplusplus
 
76
}
 
77
#endif
 
78
 
74
79
#define CLIENT_NET_READ_TIMEOUT    365*24*3600  /* Timeout on read */
75
80
#define CLIENT_NET_WRITE_TIMEOUT  365*24*3600  /* Timeout on write */
76
81
 
90
95
#define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */
91
96
#define CLIENT_MULTI_RESULTS    (1UL << 17) /* Enable/disable multi-results */
92
97
 
93
 
#define CLIENT_ADMIN            (1UL << 25) /* Admin client connection */
94
 
 
95
98
#define CLIENT_SSL_VERIFY_SERVER_CERT (1UL << 30)
96
99
#define CLIENT_REMEMBER_OPTIONS (1UL << 31)
97
100
 
110
113
                           CLIENT_SECURE_CONNECTION | \
111
114
                           CLIENT_MULTI_STATEMENTS | \
112
115
                           CLIENT_MULTI_RESULTS | \
113
 
                           CLIENT_ADMIN | \
114
116
                           CLIENT_SSL_VERIFY_SERVER_CERT | \
115
117
                           CLIENT_REMEMBER_OPTIONS)
116
118
 
123
125
                                               & ~CLIENT_COMPRESS) \
124
126
                                               & ~CLIENT_SSL_VERIFY_SERVER_CERT)
125
127
 
126
 
} /* namespace drizzle_plugin */
127
 
 
128
128
#endif /* PLUGIN_MYSQL_PROTOCOL_OPTIONS_H */