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 for update

Browse Source 
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  Merge for updates
mysql-test/r/rpl_change_master.result:
  Merge for updates
sql/share/czech/errmsg.txt:
  Merge for updates
sql/share/danish/errmsg.txt:
  Merge for updates
sql/share/dutch/errmsg.txt:
  Merge for updates
sql/share/english/errmsg.txt:
  Merge for updates
sql/share/estonian/errmsg.txt:
  Merge for updates
sql/share/french/errmsg.txt:
  Merge for updates
sql/share/german/errmsg.txt:
  Merge for updates
sql/share/greek/errmsg.txt:
  Merge for updates
sql/share/hungarian/errmsg.txt:
  Merge for updates
sql/share/italian/errmsg.txt:
  Merge for updates
sql/share/japanese/errmsg.txt:
  Merge for updates
sql/share/korean/errmsg.txt:
  Merge for updates
sql/share/norwegian-ny/errmsg.txt:
  Merge for updates
sql/share/norwegian/errmsg.txt:
  Merge for updates
sql/share/polish/errmsg.txt:
  Merge for updates
sql/share/portuguese/errmsg.txt:
  Merge for updates
sql/share/romanian/errmsg.txt:
  Merge for updates
sql/share/russian/errmsg.txt:
  Merge for updates
sql/share/serbian/errmsg.txt:
  Merge for updates
sql/share/slovak/errmsg.txt:
  Merge for updates
sql/share/spanish/errmsg.txt:
  Merge for updates
sql/share/swedish/errmsg.txt:
  Merge for updates
sql/share/ukrainian/errmsg.txt:
  Merge for updates
This commit is contained in:
unknown
2003-12-02 20:57:34 +00:00
parent 0e286c9028 c74c90eef6
commit 09eadf65fb
41 changed files with 207 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/create.result
View File

@ -201,17 +201,16 @@ t1 CREATE TABLE `t1` (
) TYPE=HEAP DEFAULT CHARSET=latin1
drop table t1;
SET SESSION table_type="gemini";
ERROR 42000: Unknown table engine 'gemini'
SELECT @@table_type;
@@table_type
GEMINI
HEAP
CREATE TABLE t1 (a int not null);
Warnings:
Warning 1265 Using storage engine MYISAM for table 't1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL default '0'
) TYPE=MyISAM DEFAULT CHARSET=latin1
) TYPE=HEAP DEFAULT CHARSET=latin1
SET SESSION table_type=default;
drop table t1;
create table t1 ( k1 varchar(2), k2 int, primary key(k1,k2));
@ -347,17 +346,16 @@ t1 CREATE TABLE `t1` (
) TYPE=HEAP DEFAULT CHARSET=latin1
drop table t1;
SET SESSION table_type="gemini";
ERROR 42000: Unknown table engine 'gemini'
SELECT @@table_type;
@@table_type
GEMINI
HEAP
CREATE TABLE t1 (a int not null);
Warnings:
Warning 1265 Using storage engine MYISAM for table 't1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL default '0'
) TYPE=MyISAM DEFAULT CHARSET=latin1
) TYPE=HEAP DEFAULT CHARSET=latin1
SET SESSION table_type=default;
drop table t1;
create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob);