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 jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/M50/mysql-5.0


sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2005-05-26 18:12:56 +02:00
parent d4be3ae2a3 df16d85926
commit e3beea23a0
17 changed files with 149 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/t/mysqldump.test
View File

@ -554,3 +554,12 @@ create table t1 (
insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1);
--exec $MYSQL_DUMP --skip-comments -c test
drop table t1;
#
# Test for --add-drop-database
#
CREATE TABLE t1 (a int);
INSERT INTO t1 VALUES (1),(2),(3);
--exec $MYSQL_DUMP --add-drop-database --skip-comments --databases test
DROP TABLE t1;

12
mysql-test/t/reserved_win_names.test
View File

@ -1,12 +0,0 @@
#
# Test of reserved Windows names
#
--require r/reserved_win_names.require
--error 1049
use COM1;
--error 1049
use LPT1;
--error 1049
use PRN;

9
mysql-test/t/select.test
View File

@ -1998,6 +1998,15 @@ select distinct all * from t1;
drop table t1;
#
#
# Test for Bug#8009, SELECT failed on bigint unsigned when using HEX
#
CREATE TABLE t1 (b BIGINT(20) UNSIGNED NOT NULL, PRIMARY KEY (b));
INSERT INTO t1 VALUES (0x8000000000000000);
SELECT b FROM t1 WHERE b=0x8000000000000000;
DROP TABLE t1;
# Test for bug #6474
#

15
mysql-test/t/union.test
View File

@ -740,12 +740,12 @@ select concat('value is: ', @val) union select 'some text';
# Enum merging test
#
CREATE TABLE t1 (
a ENUM('<EFBFBD>','<EFBFBD>','<EFBFBD>') character set utf8 not null default '<EFBFBD>',
a ENUM('ä','ö','ü') character set utf8 not null default 'ü',
b ENUM("one", "two") character set utf8,
c ENUM("one", "two")
);
show create table t1;
insert into t1 values ('<EFBFBD>', 'one', 'one'), ('<EFBFBD>', 'two', 'one'), ('<EFBFBD>', NULL, NULL);
insert into t1 values ('ä', 'one', 'one'), ('ö', 'two', 'one'), ('ü', NULL, NULL);
create table t2 select NULL union select a from t1;
show columns from t2;
drop table t2;
@ -772,3 +772,14 @@ select row_format from information_schema.TABLES where table_schema="test" and t
alter table t2 ROW_FORMAT=fixed;
show create table t2;
drop table t1,t2;
#
# Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM
#
create table t1 ( id int not null auto_increment, primary key (id), col1 int);
insert into t1 (col1) values (2),(3),(4),(5),(6);
select 99 union all select id from t1 order by 1;
select id from t1 union all select 99 order by 1;
drop table t1;