database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge problem fixes

Browse Source 
mysql-test/r/client_xml.result:
  Update testresult
mysql-test/r/ndb_autodiscover.result:
  Moving order opf test results to match test execution order
This commit is contained in:
unknown
2005-06-27 12:25:15 +02:00
parent 7ce673073b
commit 74586e95fc
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
</row> </row>
</resultset> </resultset>
<?xml version="1.0"?> <?xml version="1.0"?>
<mysqldump> <mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<database name="test"> <database name="test">
<table_structure name="t1"> <table_structure name="t1">
<field Field="a&amp;b" Type="int(11)" Null="YES" Key="" Extra="" /> <field Field="a&amp;b" Type="int(11)" Null="YES" Key="" Extra="" />

20
mysql-test/r/ndb_autodiscover.result
View File

@ -373,6 +373,16 @@ use test2;
drop table t2; drop table t2;
drop database test2; drop database test2;
use test; use test;
drop database if exists test_only_ndb_tables;
create database test_only_ndb_tables;
use test_only_ndb_tables;
create table t1 (a int primary key) engine=ndb;
select * from t1;
a
select * from t1;
ERROR HY000: Can't lock file (errno: 4009)
use test;
drop database test_only_ndb_tables;
CREATE TABLE sys.SYSTAB_0 (a int); CREATE TABLE sys.SYSTAB_0 (a int);
ERROR 42S01: Table 'SYSTAB_0' already exists ERROR 42S01: Table 'SYSTAB_0' already exists
select * from sys.SYSTAB_0; select * from sys.SYSTAB_0;
@ -387,16 +397,6 @@ ERROR 42S02: Unknown table 'SYSTAB_0'
drop table IF EXISTS sys.SYSTAB_0; drop table IF EXISTS sys.SYSTAB_0;
Warnings: Warnings:
Note 1051 Unknown table 'SYSTAB_0' Note 1051 Unknown table 'SYSTAB_0'
drop database if exists test_only_ndb_tables;
create database test_only_ndb_tables;
use test_only_ndb_tables;
create table t1 (a int primary key) engine=ndb;
select * from t1;
a
select * from t1;
ERROR HY000: Can't lock file (errno: 4009)
use test;
drop database test_only_ndb_tables;
CREATE TABLE t9 ( CREATE TABLE t9 (
a int NOT NULL PRIMARY KEY, a int NOT NULL PRIMARY KEY,
b int b int