mirror of
https://github.com/MariaDB/server.git
synced 2026-05-01 20:55:32 +02:00
a3e83048a3
between 5.0 and 5.1.
The problem was that in the patch for Bug#11986 it was decided
to store original query in UTF8 encoding for the INFORMATION_SCHEMA.
This approach however turned out to be quite difficult to implement
properly. The main problem is to preserve the same IS-output after
dump/restore.
So, the fix is to rollback to the previous functionality, but also
to fix it to support multi-character-set-queries properly. The idea
is to generate INFORMATION_SCHEMA-query from the item-tree after
parsing view declaration. The IS-query should:
- be completely in UTF8;
- not contain character set introducers.
For more information, see WL4052.
mysql-test/include/ddl_i18n.check_views.inc:
Add a test case for Bug#30217.
mysql-test/r/ddl_i18n_koi8r.result:
Update result file.
mysql-test/r/ddl_i18n_utf8.result:
Update result file.
mysql-test/r/information_schema.result:
Update result file.
mysql-test/r/information_schema_db.result:
Update result file.
mysql-test/r/mysqldump.result:
Update result file.
mysql-test/r/show_check.result:
Update result file.
mysql-test/t/ddl_i18n_koi8r.test:
Add a test case for Bug#30217.
mysql-test/t/ddl_i18n_utf8.test:
Add a test case for Bug#30217.
mysql-test/t/mysqldump.test:
Add a test case for Bug#30217.
sql/ha_ndbcluster.cc:
Add a parameter to print().
sql/item.cc:
1. Add a parameter to print().
2. Item_string::print():
- Do not append character set introducer to the text literal
if we're building a query for INFORMATION_SCHEMA;
- Convert text literal to UTF8 if we're building a query
for INFORMATION_SCHEMA.
sql/item.h:
Add a parameter to print().
sql/item_cmpfunc.cc:
Add a parameter to print().
sql/item_cmpfunc.h:
Add a parameter to print().
sql/item_func.cc:
Add a parameter to print().
sql/item_func.h:
Add a parameter to print().
sql/item_geofunc.h:
Add a parameter to print().
sql/item_row.cc:
Add a parameter to print().
sql/item_row.h:
Add a parameter to print().
sql/item_strfunc.cc:
Add a parameter to print().
sql/item_strfunc.h:
Add a parameter to print().
sql/item_subselect.cc:
Add a parameter to print().
sql/item_subselect.h:
Add a parameter to print().
sql/item_sum.cc:
Add a parameter to print().
sql/item_sum.h:
Add a parameter to print().
sql/item_timefunc.cc:
Add a parameter to print().
sql/item_timefunc.h:
Add a parameter to print().
sql/mysql_priv.h:
Add a parameter to print().
sql/sp_head.cc:
Add a parameter to print().
sql/sql_lex.cc:
Add a parameter to print().
sql/sql_lex.h:
Add a parameter to print().
sql/sql_parse.cc:
Add a parameter to print().
sql/sql_select.cc:
Add a parameter to print().
sql/sql_show.cc:
Add a parameter to print().
sql/sql_test.cc:
Add a parameter to print().
sql/sql_view.cc:
Build INFORMATION_SCHEMA query from Item-tree.
sql/sql_yacc.yy:
Build INFORMATION_SCHEMA query from Item-tree.
sql/table.h:
Add a parameter to print().
79 lines
2.4 KiB
C++
79 lines
2.4 KiB
C++
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
class Item_row: public Item
|
|
{
|
|
Item **items;
|
|
table_map used_tables_cache;
|
|
uint arg_count;
|
|
bool const_item_cache;
|
|
bool with_null;
|
|
public:
|
|
Item_row(List<Item> &);
|
|
Item_row(Item_row *item):
|
|
Item(),
|
|
items(item->items),
|
|
used_tables_cache(item->used_tables_cache),
|
|
arg_count(item->arg_count),
|
|
const_item_cache(item->const_item_cache),
|
|
with_null(0)
|
|
{}
|
|
|
|
enum Type type() const { return ROW_ITEM; };
|
|
void illegal_method_call(const char *);
|
|
bool is_null() { return null_value; }
|
|
void make_field(Send_field *)
|
|
{
|
|
illegal_method_call((const char*)"make_field");
|
|
};
|
|
double val_real()
|
|
{
|
|
illegal_method_call((const char*)"val");
|
|
return 0;
|
|
};
|
|
longlong val_int()
|
|
{
|
|
illegal_method_call((const char*)"val_int");
|
|
return 0;
|
|
};
|
|
String *val_str(String *)
|
|
{
|
|
illegal_method_call((const char*)"val_str");
|
|
return 0;
|
|
};
|
|
my_decimal *val_decimal(my_decimal *)
|
|
{
|
|
illegal_method_call((const char*)"val_decimal");
|
|
return 0;
|
|
};
|
|
bool fix_fields(THD *thd, Item **ref);
|
|
void cleanup();
|
|
void split_sum_func(THD *thd, Item **ref_pointer_array, List<Item> &fields);
|
|
table_map used_tables() const { return used_tables_cache; };
|
|
bool const_item() const { return const_item_cache; };
|
|
enum Item_result result_type() const { return ROW_RESULT; }
|
|
void update_used_tables();
|
|
virtual void print(String *str, enum_query_type query_type);
|
|
|
|
bool walk(Item_processor processor, bool walk_subquery, uchar *arg);
|
|
Item *transform(Item_transformer transformer, uchar *arg);
|
|
|
|
uint cols() { return arg_count; }
|
|
Item* element_index(uint i) { return items[i]; }
|
|
Item** addr(uint i) { return items + i; }
|
|
bool check_cols(uint c);
|
|
bool null_inside() { return with_null; };
|
|
void bring_value();
|
|
};
|