Commit ab5023d8 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/my/mysql-5.0


mysql-test/t/variables.test:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
parents f11418f7 8db171df

innobase/row/row0sel.c

+12 −4
Original line number Diff line number Diff line
@@ -2524,13 +2524,21 @@ row_sel_store_mysql_rec( 
					(byte) (templ->mysql_null_bit_mask);

			switch (templ->type) {

			case DATA_VARCHAR:

			case DATA_CHAR:

			case DATA_BINARY:

			case DATA_VARMYSQL:

				if (templ->mysql_type

				    == DATA_MYSQL_TRUE_VARCHAR) {

					/* This is a >= 5.0.3 type

					true VARCHAR.  Zero the field. */

					pad_char = 0x00;

					break;

				}

				/* Fall through */

			case DATA_CHAR:

			case DATA_FIXBINARY:

			case DATA_MYSQL:

			case DATA_VARMYSQL:

			        /* MySQL pads all non-BLOB and non-TEXT

				string types with space ' ' */

			        /* MySQL pads all string types (except

				BLOB, TEXT and true VARCHAR) with space. */

				if (UNIV_UNLIKELY(templ->mbminlen == 2)) {

					/* Treat UCS2 as a special case. */

					data = mysql_rec

mysql-test/r/information_schema.result

+9 −0
Original line number Diff line number Diff line
@@ -940,3 +940,12 @@ f5 19 NULL 
f6	1	NULL

f7	64	NULL

drop table t1;

create table t1 (f1 integer);

create trigger tr1 after insert on t1 for each row set @test_var=42;

use information_schema;

select trigger_schema, trigger_name from triggers where

trigger_name='tr1';

trigger_schema	trigger_name

test	tr1

use test;

drop table t1;

mysql-test/r/innodb.result

+4 −4
Original line number Diff line number Diff line
@@ -1452,16 +1452,16 @@ Error 1146 Table 'test.t4' doesn't exist 
checksum table t1, t2, t3, t4;

Table	Checksum

test.t1	2948697075

test.t2	1157260244

test.t3	1157260244

test.t2	3835700799

test.t3	3835700799

test.t4	NULL

Warnings:

Error	1146	Table 'test.t4' doesn't exist

checksum table t1, t2, t3, t4 extended;

Table	Checksum

test.t1	3092701434

test.t2	1157260244

test.t3	1157260244

test.t2	3835700799

test.t3	3835700799

test.t4	NULL

Warnings:

Error	1146	Table 'test.t4' doesn't exist

mysql-test/r/variables.result

+12 −0
Original line number Diff line number Diff line
@@ -525,3 +525,15 @@ set @@warning_count=1; 
ERROR HY000: Variable 'warning_count' is a read only variable

set @@global.error_count=1;

ERROR HY000: Variable 'error_count' is a read only variable

set @@max_heap_table_size= 4294967296;

select @@max_heap_table_size;

@@max_heap_table_size

4294967296

set global max_heap_table_size= 4294967296;

select @@max_heap_table_size;

@@max_heap_table_size

4294967296

set @@max_heap_table_size= 4294967296;

select @@max_heap_table_size;

@@max_heap_table_size

4294967296

mysql-test/t/information_schema.test

+11 −0
Original line number Diff line number Diff line
@@ -622,3 +622,14 @@ select column_name, NUMERIC_PRECISION, NUMERIC_SCALE 
from information_schema.columns

where table_name='t1';

drop table t1;



#

# Bug #12127 triggers do not show in info_schema before they are used if set to the database

#

create table t1 (f1 integer);

create trigger tr1 after insert on t1 for each row set @test_var=42;

use information_schema;

select trigger_schema, trigger_name from triggers where

trigger_name='tr1';

use test;

drop table t1;