mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

correct fix for the old Bug#39955 (warnings in I_S.VARIABLES)

Browse source 
old fix only generated a warning for the *first* row
in the output
This commit is contained in:
Sergei Golubchik 2014-08-28 09:33:00 +02:00
parent d281faf992
commit 9bd5d54c11
3 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mysql-test/r/information_schema.result
View file

@ -1637,6 +1637,33 @@ drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists drop table if exists t1;drop table if exists
Warnings: Warnings:
Warning 1265 Data truncated for column 'VARIABLE_VALUE' at row 1 Warning 1265 Data truncated for column 'VARIABLE_VALUE' at row 1
select * from information_schema.global_variables where variable_name like 'init%' order by variable_name;
VARIABLE_NAME VARIABLE_VALUE
INIT_CONNECT drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists t1;
drop table if exists t1;drop table if exists
INIT_FILE
INIT_SLAVE
Warnings:
Warning 1265 Data truncated for column 'VARIABLE_VALUE' at row #
set global init_connect=""; set global init_connect="";
create table t0 select * from information_schema.global_status where VARIABLE_NAME='COM_SELECT'; create table t0 select * from information_schema.global_status where VARIABLE_NAME='COM_SELECT';
SELECT 1; SELECT 1;

2
mysql-test/t/information_schema.test
View file

@ -1358,6 +1358,8 @@ drop table if exists t1;drop table if exists t1;\
drop table if exists t1;drop table if exists t1;\ drop table if exists t1;drop table if exists t1;\
drop table if exists t1;drop table if exists t1;"; drop table if exists t1;drop table if exists t1;";
select * from information_schema.global_variables where variable_name='init_connect'; select * from information_schema.global_variables where variable_name='init_connect';
--replace_regex /at row [123]/at row #/
select * from information_schema.global_variables where variable_name like 'init%' order by variable_name;
set global init_connect=""; set global init_connect="";
# #

2
sql/sql_show.cc
View file

@ -3111,7 +3111,6 @@ static bool show_status_array(THD *thd, const char *wild,
break; break;
} }
table->field[1]->store(pos, (uint32) (end - pos), charset); table->field[1]->store(pos, (uint32) (end - pos), charset);
thd->count_cuted_fields= CHECK_FIELD_IGNORE;
table->field[1]->set_notnull(); table->field[1]->set_notnull();
mysql_mutex_unlock(&LOCK_global_system_variables); mysql_mutex_unlock(&LOCK_global_system_variables);
@ -3121,6 +3120,7 @@ static bool show_status_array(THD *thd, const char *wild,
res= TRUE; res= TRUE;
goto end; goto end;
} }
thd->get_stmt_da()->inc_current_row_for_warning();
} }
} }
} }