File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change 169
169
#define JSONMAX 10 // JSON Default max grp size
170
170
171
171
extern " C" {
172
- char version[]= " Version 1.04.0003 September 15 , 2015" ;
172
+ char version[]= " Version 1.04.0003 October 20 , 2015" ;
173
173
#if defined(__WIN__)
174
174
char compver[]= " Version 1.04.0003 " __DATE__ " " __TIME__;
175
175
char slash= ' \\ ' ;
@@ -1134,7 +1134,10 @@ PTOS ha_connect::GetTableOptionStruct(TABLE_SHARE *s)
1134
1134
{
1135
1135
TABLE_SHARE *tsp= (tshp) ? tshp : (s) ? s : table_share;
1136
1136
1137
- return (tsp) ? tsp->option_struct : NULL ;
1137
+ return (tsp && (!tsp->db_plugin ||
1138
+ !stricmp (plugin_name (tsp->db_plugin )->str , " connect" ) ||
1139
+ !stricmp (plugin_name (tsp->db_plugin )->str , " partition" )))
1140
+ ? tsp->option_struct : NULL ;
1138
1141
} // end of GetTableOptionStruct
1139
1142
1140
1143
/* ***************************************************************************/
@@ -2529,7 +2532,7 @@ PFIL ha_connect::CondFilter(PGLOBAL g, Item *cond)
2529
2532
!(colp[i]= tdbp->ColDB (g, (PSZ)pField->field ->field_name , 0 )))
2530
2533
return NULL ; // Column does not belong to this table
2531
2534
2532
- // These are not yet implemented (buggy)
2535
+ // These types are not yet implemented (buggy)
2533
2536
switch (pField->field ->type ()) {
2534
2537
case MYSQL_TYPE_TIMESTAMP:
2535
2538
case MYSQL_TYPE_DATE:
You can’t perform that action at this time.
0 commit comments