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

Many files:

Browse Source 
Post-merge fix.


mysql-test/suite/rpl/r/rpl_udf.result:
  Post-merge fix.
mysql-test/suite/ndb/r/ndb_dd_basic.result:
  Post-merge fix.
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
  Post-merge fix.
mysql-test/suite/ndb/r/ndb_gis.result:
  Post-merge fix.
mysql-test/suite/ndb/r/ndb_row_format.result:
  Post-merge fix.
mysql-test/suite/ndb/r/ndb_single_user.result:
  Post-merge fix.
This commit is contained in:
unknown
2007-08-03 12:37:00 +02:00
parent 6930e7dedf
commit 8a2384d5e9
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/ndb/r/ndb_dd_basic.result
View File

@@ -5,20 +5,20 @@ INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M UNDO_BUFFER_SIZE = 1M
ENGINE=MYISAM; ENGINE=MYISAM;
Warnings: Warnings:
Error 1475 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP' Error 1476 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
ALTER LOGFILE GROUP lg1 ALTER LOGFILE GROUP lg1
ADD UNDOFILE 'undofile02.dat' ADD UNDOFILE 'undofile02.dat'
INITIAL_SIZE = 4M INITIAL_SIZE = 4M
ENGINE=XYZ; ENGINE=XYZ;
Warnings: Warnings:
Warning 1286 Unknown table engine 'XYZ' Warning 1286 Unknown table engine 'XYZ'
Error 1475 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP' Error 1476 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
CREATE TABLESPACE ts1 CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat' ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1 USE LOGFILE GROUP lg1
INITIAL_SIZE 12M; INITIAL_SIZE 12M;
Warnings: Warnings:
Error 1475 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP' Error 1476 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'
set storage_engine=ndb; set storage_engine=ndb;
CREATE LOGFILE GROUP lg1 CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat' ADD UNDOFILE 'undofile.dat'

2
mysql-test/suite/ndb/r/ndb_dd_ddl.result
View File

@@ -16,7 +16,7 @@ ERROR HY000: Failed to create LOGFILE GROUP
SHOW WARNINGS; SHOW WARNINGS;
Level Code Message Level Code Message
Error 1296 Got error 1514 'Currently there is a limit of one logfile group' from NDB Error 1296 Got error 1514 'Currently there is a limit of one logfile group' from NDB
Error 1525 Failed to create LOGFILE GROUP Error 1526 Failed to create LOGFILE GROUP
CREATE LOGFILE GROUP lg1 CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat' ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 1M INITIAL_SIZE 1M

4
mysql-test/suite/ndb/r/ndb_gis.result
View File

@@ -463,7 +463,7 @@ drop table t1;
End of 4.1 tests End of 4.1 tests
CREATE TABLE t1 (name VARCHAR(100), square GEOMETRY); CREATE TABLE t1 (name VARCHAR(100), square GEOMETRY);
Warnings: Warnings:
Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1476 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
INSERT INTO t1 VALUES("center", GeomFromText('POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0))')); INSERT INTO t1 VALUES("center", GeomFromText('POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0))'));
INSERT INTO t1 VALUES("small", GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))')); INSERT INTO t1 VALUES("small", GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))'));
INSERT INTO t1 VALUES("big", GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))')); INSERT INTO t1 VALUES("big", GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))'));
@@ -1013,7 +1013,7 @@ drop table t1;
End of 4.1 tests End of 4.1 tests
CREATE TABLE t1 (name VARCHAR(100), square GEOMETRY); CREATE TABLE t1 (name VARCHAR(100), square GEOMETRY);
Warnings: Warnings:
Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1476 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
INSERT INTO t1 VALUES("center", GeomFromText('POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0))')); INSERT INTO t1 VALUES("center", GeomFromText('POLYGON (( 0 0, 0 2, 2 2, 2 0, 0 0))'));
INSERT INTO t1 VALUES("small", GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))')); INSERT INTO t1 VALUES("small", GeomFromText('POLYGON (( 0 0, 0 1, 1 1, 1 0, 0 0))'));
INSERT INTO t1 VALUES("big", GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))')); INSERT INTO t1 VALUES("big", GeomFromText('POLYGON (( 0 0, 0 3, 3 3, 3 0, 0 0))'));

2
mysql-test/suite/ndb/r/ndb_row_format.result
View File

@@ -8,7 +8,7 @@ ENGINE=NDB;
ERROR HY000: Can't create table 'test.t1' (errno: 138) ERROR HY000: Can't create table 'test.t1' (errno: 138)
SHOW WARNINGS; SHOW WARNINGS;
Level Code Message Level Code Message
Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Row format FIXED incompatible with variable sized attribute' Error 1476 Table storage engine 'ndbcluster' does not support the create option 'Row format FIXED incompatible with variable sized attribute'
Error 1005 Can't create table 'test.t1' (errno: 138) Error 1005 Can't create table 'test.t1' (errno: 138)
CREATE TABLE t1 CREATE TABLE t1
( a INT KEY, ( a INT KEY,

10
mysql-test/suite/ndb/r/ndb_single_user.result
View File

@@ -11,7 +11,7 @@ ERROR HY000: Failed to create LOGFILE GROUP
show warnings; show warnings;
Level Code Message Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
Error 1525 Failed to create LOGFILE GROUP Error 1526 Failed to create LOGFILE GROUP
create table t1 (a int key, b int unique, c int) engine ndb; create table t1 (a int key, b int unique, c int) engine ndb;
CREATE LOGFILE GROUP lg1 CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat' ADD UNDOFILE 'undofile.dat'
@@ -27,14 +27,14 @@ ERROR HY000: Failed to create TABLESPACE
show warnings; show warnings;
Level Code Message Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
Error 1525 Failed to create TABLESPACE Error 1526 Failed to create TABLESPACE
DROP LOGFILE GROUP lg1 DROP LOGFILE GROUP lg1
ENGINE =NDB; ENGINE =NDB;
ERROR HY000: Failed to drop LOGFILE GROUP ERROR HY000: Failed to drop LOGFILE GROUP
show warnings; show warnings;
Level Code Message Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
Error 1526 Failed to drop LOGFILE GROUP Error 1527 Failed to drop LOGFILE GROUP
CREATE TABLESPACE ts1 CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat' ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1 USE LOGFILE GROUP lg1
@@ -47,7 +47,7 @@ ERROR HY000: Failed to alter: DROP DATAFILE
show warnings; show warnings;
Level Code Message Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
Error 1530 Failed to alter: DROP DATAFILE Error 1531 Failed to alter: DROP DATAFILE
ALTER TABLESPACE ts1 ALTER TABLESPACE ts1
DROP DATAFILE 'datafile.dat' DROP DATAFILE 'datafile.dat'
ENGINE NDB; ENGINE NDB;
@@ -57,7 +57,7 @@ ERROR HY000: Failed to drop TABLESPACE
show warnings; show warnings;
Level Code Message Level Code Message
Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB Error 1296 Got error 299 'Operation not allowed or aborted due to single user mode' from NDB
Error 1526 Failed to drop TABLESPACE Error 1527 Failed to drop TABLESPACE
DROP TABLESPACE ts1 DROP TABLESPACE ts1
ENGINE NDB; ENGINE NDB;
DROP LOGFILE GROUP lg1 DROP LOGFILE GROUP lg1

8
mysql-test/suite/rpl/r/rpl_udf.result
View File

@@ -182,19 +182,19 @@ CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
affected rows: 0 affected rows: 0
INSERT INTO t1 VALUES(myfunc_int(100), myfunc_double(50.00)); INSERT INTO t1 VALUES(myfunc_int(100), myfunc_double(50.00));
Warnings: Warnings:
Warning 1589 Statement is not safe to log in statement format. Warning 1590 Statement is not safe to log in statement format.
affected rows: 1 affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(10), myfunc_double(5.00)); INSERT INTO t1 VALUES(myfunc_int(10), myfunc_double(5.00));
Warnings: Warnings:
Warning 1589 Statement is not safe to log in statement format. Warning 1590 Statement is not safe to log in statement format.
affected rows: 1 affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(200), myfunc_double(25.00)); INSERT INTO t1 VALUES(myfunc_int(200), myfunc_double(25.00));
Warnings: Warnings:
Warning 1589 Statement is not safe to log in statement format. Warning 1590 Statement is not safe to log in statement format.
affected rows: 1 affected rows: 1
INSERT INTO t1 VALUES(myfunc_int(1), myfunc_double(500.00)); INSERT INTO t1 VALUES(myfunc_int(1), myfunc_double(500.00));
Warnings: Warnings:
Warning 1589 Statement is not safe to log in statement format. Warning 1590 Statement is not safe to log in statement format.
affected rows: 1 affected rows: 1
SELECT * FROM t1 ORDER BY sum; SELECT * FROM t1 ORDER BY sum;
sum price sum price