database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge build.mysql.com:/users/tulin/mysql-5.0

Browse Source 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
This commit is contained in:
tulin@build.mysql.com
2005-01-12 21:01:15 +01:00
parent f70e030fd4 d7a233261a
commit 2c174baf8a
32 changed files with 223 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/ctype_cp932.result
View File

@@ -8573,7 +8573,7 @@ F9F9
F9FA
F9FB
F9FC
CREATE TABLE t4 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t1;
CREATE TABLE t4 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t1;
SELECT HEX(c1) FROM t4;
HEX(c1)
05

12
mysql-test/r/ctype_eucjp_ms.result → mysql-test/r/ctype_eucjpms.result
View File

@@ -2,9 +2,9 @@ drop table if exists t1;
drop table if exists t2;
drop table if exists t3;
drop table if exists t4;
set names eucjp_ms;
set character_set_database = eucjp_ms;
CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjp_ms;
set names eucjpms;
set character_set_database = eucjpms;
CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjpms;
INSERT INTO t1 VALUES
(0x5C),(0x7E),(0xA1B1),(0xA1BD),(0xA1C0),(0xA1C1),(0xA1C2),(0xA1DD),(0xA1F1),(0xA1F2),(0xA1EF),(0xA2CC),(0x8FA2B7),(0x8FA2C3);
INSERT INTO t1 VALUES
@@ -5045,7 +5045,7 @@ E754
E755
E756
E757
CREATE TABLE t3 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t2;
CREATE TABLE t3 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t2;
SELECT HEX(c1) FROM t3;
HEX(c1)
5C
@@ -9781,3 +9781,7 @@ F9F9
F9FA
F9FB
F9FC
DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;
DROP TABLE t4;

4
mysql-test/r/type_timestamp.result
View File

@@ -35,6 +35,10 @@ UPDATE t1 SET value="my value" WHERE id="myKey";
SELECT stamp FROM t1 WHERE id="myKey";
stamp
1999-04-02 00:00:00
UPDATE t1 SET id="myKey" WHERE value="my value";
SELECT stamp FROM t1 WHERE id="myKey";
stamp
1999-04-02 00:00:00
drop table t1;
create table t1 (a timestamp);
insert into t1 values (now());

4
mysql-test/t/ctype_cp932.test
View File

@@ -387,8 +387,8 @@ SELECT HEX(c1) FROM t2;
CREATE TABLE t3 SELECT CONVERT(c1 USING cp932) AS c1 FROM t2;
SELECT HEX(c1) FROM t3;
#Test conversion to eucjp_ms
CREATE TABLE t4 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t1;
#Test conversion to eucjpms
CREATE TABLE t4 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t1;
SELECT HEX(c1) FROM t4;
DROP TABLE t1;

9
mysql-test/t/ctype_eucjp_ms.test → mysql-test/t/ctype_eucjpms.test
View File

@@ -1,4 +1,3 @@
--character_set eucjp_ms
--disable_warnings
drop table if exists t1;
drop table if exists t2;
@@ -6,10 +5,10 @@ drop table if exists t3;
drop table if exists t4;
--enable_warnings
set names eucjp_ms;
set character_set_database = eucjp_ms;
set names eucjpms;
set character_set_database = eucjpms;
CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjp_ms;
CREATE TABLE t1(c1 CHAR(1)) DEFAULT CHARACTER SET = eucjpms;
#Characters which are converted to Unicode ambiguously
INSERT INTO t1 VALUES
@@ -332,7 +331,7 @@ CREATE TABLE t2 SELECT CONVERT(c1 USING ucs2) AS c1 FROM t1;
SELECT HEX(c1) FROM t2;
#Test round trip conversion
CREATE TABLE t3 SELECT CONVERT(c1 USING eucjp_ms) AS c1 FROM t2;
CREATE TABLE t3 SELECT CONVERT(c1 USING eucjpms) AS c1 FROM t2;
SELECT HEX(c1) FROM t3;
#Test conversion to cp932

2
mysql-test/t/func_compress.test
View File

@@ -2,6 +2,8 @@
#
# Test for compress and uncompress functions:
#
# Note that this test gives error in the gzip library when running under
# valgrind, but these warnings can be ignored
select @test_compress_string:='string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ';
select length(@test_compress_string);

2
mysql-test/t/type_timestamp.test
View File

@@ -29,6 +29,8 @@ INSERT INTO t1 VALUES ("my value", "myKey","1999-04-02 00:00:00");
SELECT stamp FROM t1 WHERE id="myKey";
UPDATE t1 SET value="my value" WHERE id="myKey";
SELECT stamp FROM t1 WHERE id="myKey";
UPDATE t1 SET id="myKey" WHERE value="my value";
SELECT stamp FROM t1 WHERE id="myKey";
drop table t1;
create table t1 (a timestamp);