database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2023-10-23 18:44:12 +03:00
parent 65700edb26 5a8fca5a4f
commit 3036b36f9b
33 changed files with 1171 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sql/sql_select.h
View File

@ -34,6 +34,8 @@
#include "opt_range.h" /* SQL_SELECT, QUICK_SELECT_I */
#include "filesort.h"
#include "cset_narrowing.h"
typedef struct st_join_table JOIN_TAB;
/* Values in optimize */
#define KEY_OPTIMIZE_EXISTS 1U
@ -1944,7 +1946,14 @@ public:
{
enum_check_fields org_count_cuted_fields= thd->count_cuted_fields;
Use_relaxed_field_copy urfc(to_field->table->in_use);
/* If needed, perform CharsetNarrowing for making ref access lookup keys. */
Utf8_narrow do_narrow(to_field, do_cset_narrowing);
store_key_result result= copy_inner();
do_narrow.stop();
thd->count_cuted_fields= org_count_cuted_fields;
return result;
}
@ -1954,6 +1963,12 @@ public:
uchar *null_ptr;
uchar err;
/*
This is set to true if we need to do Charset Narrowing when making a lookup
key.
*/
bool do_cset_narrowing= false;
virtual enum store_key_result copy_inner()=0;
};
@ -1973,6 +1988,7 @@ class store_key_field: public store_key
if (to_field)
{
copy_field.set(to_field,from_field,0);
setup_charset_narrowing();
}
}
@ -1983,6 +1999,15 @@ class store_key_field: public store_key
{
copy_field.set(to_field, fld_item->field, 0);
field_name= fld_item->full_name();
setup_charset_narrowing();
}
/* Setup CharsetNarrowing if necessary */
void setup_charset_narrowing()
{
do_cset_narrowing=
Utf8_narrow::should_do_narrowing(copy_field.to_field,
copy_field.from_field->charset());
}
protected:
@ -2023,7 +2048,12 @@ public:
:store_key(thd, to_field_arg, ptr,
null_ptr_arg ? null_ptr_arg : item_arg->maybe_null() ?
&err : (uchar*) 0, length), item(item_arg), use_value(val)
{}
{
/* Setup CharsetNarrowing to be done if necessary */
do_cset_narrowing=
Utf8_narrow::should_do_narrowing(to_field,
item->collation.collation);
}
store_key_item(store_key &arg, Item *new_item, bool val)
:store_key(arg), item(new_item), use_value(val)
{}
@ -2411,7 +2441,7 @@ Item_equal *find_item_equal(COND_EQUAL *cond_equal, Field *field,
extern bool test_if_ref(Item *,
Item_field *left_item,Item *right_item);
inline bool optimizer_flag(THD *thd, ulonglong flag)
inline bool optimizer_flag(const THD *thd, ulonglong flag)
{
return (thd->variables.optimizer_switch & flag);
}