Commit 5cdec5d6 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/limit.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/t/strict.test:
  SCCS merged
parents 51653cb2 2f19824d

mysql-test/r/create.result

+4 −0
Original line number Diff line number Diff line
@@ -267,11 +267,15 @@ drop table t1; 
create table t1 (a int not null, b int, primary key (a));

insert into t1 values (1,1);

create table if not exists t1 select 2;

Warnings:

Warning	1364	Field 'a' doesn't have a default value

select * from t1;

a	b

1	1

0	2

create table if not exists t1 select 3 as 'a',4 as 'b';

Warnings:

Warning	1364	Field 'a' doesn't have a default value

create table if not exists t1 select 3 as 'a',3 as 'b';

ERROR 23000: Duplicate entry '3' for key 1

select * from t1;

mysql-test/r/ctype_latin1_de.result

+2 −2
Original line number Diff line number Diff line
@@ -220,12 +220,12 @@ select * from t1 where match a against ("te*" in boolean mode)+0; 
a

test

drop table t1;

create table t1 (word varchar(255) not null, word2 varchar(255) not null, index(word));

create table t1 (word varchar(255) not null, word2 varchar(255) not null default '', index(word));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `word` varchar(255) collate latin1_german2_ci NOT NULL,

  `word2` varchar(255) collate latin1_german2_ci NOT NULL,

  `word2` varchar(255) collate latin1_german2_ci NOT NULL default '',

  KEY `word` (`word`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci

insert into t1 (word) values ('ss'),(0xDF),(0xE4),('ae');

mysql-test/r/ctype_many.result

+88 B (37.7 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

mysql-test/r/gis-rtree.result

+0 −1
Original line number Diff line number Diff line
@@ -758,7 +758,6 @@ SPATIAL KEY(g) 
INSERT INTO t1 (g) VALUES (GeomFromText('LineString(1 2, 2 3)')),(GeomFromText('LineString(1 2, 2 4)'));

drop table t1;

CREATE TABLE t1 (

geoobjid INT NOT NULL,

line LINESTRING NOT NULL,

kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',

name VARCHAR(32),

mysql-test/r/grant.result

+4 −0
Original line number Diff line number Diff line
@@ -157,6 +157,10 @@ select 1; 
1

1

insert into mysql.user (host, user) values ('localhost', 'test11');

Warnings:

Warning	1364	Field 'ssl_cipher' doesn't have a default value

Warning	1364	Field 'x509_issuer' doesn't have a default value

Warning	1364	Field 'x509_subject' doesn't have a default value

insert into mysql.db (host, db, user, select_priv) values 

('localhost', 'a%', 'test11', 'Y'), ('localhost', 'ab%', 'test11', 'Y');

alter table mysql.db order by db asc;