mirror of
https://github.com/MariaDB/server.git
synced 2025-10-31 15:50:51 +03:00
f610296d98
extra/comp_err.c: Allow one to have multiple start-error-numbers in the same error.txt file. Generate 'empty' error strings for the missing error numbers in the errmsg.sys file mysql-test/r/bigint.result: Update results to use new error numbers mysql-test/r/dyncol.result: Update results to use new error numbers mysql-test/r/func_math.result: Update results to use new error numbers mysql-test/r/func_str.result: Update results to use new error numbers mysql-test/r/plugin.result: Update results to use new error numbers mysql-test/r/table_options.result: Update results to use new error numbers mysql-test/r/type_newdecimal.result: Update results to use new error numbers mysql-test/r/warnings.result: Update results to use new error numbers mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result: Update results to use new error numbers mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result: Update results to use new error numbers mysql-test/suite/vcol/r/vcol_misc.result: Update results to use new error numbers sql/derror.cc: Ensure we don't read a errmsg.sys with a missing required error message; This change was needed as errmsg.sys may now contain empty error messages between the MySQL and MariaDB error messages. If error message file didn't exist and we have not read one in the past, don't continue. Give better error message if the errmsg.sys header has changed. sql/share/errmsg.txt: Create new section, starting from 1900, for MariaDB error messages
183 lines
5.7 KiB
Plaintext
183 lines
5.7 KiB
Plaintext
drop table if exists t1;
|
|
SET @OLD_SQL_MODE=@@SQL_MODE;
|
|
SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS';
|
|
create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1='1v1';
|
|
Warnings:
|
|
Warning 1911 Unknown option 'fkey'
|
|
Warning 1911 Unknown option 'dff'
|
|
Warning 1911 Unknown option 'tkey1'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey`=vvv,
|
|
KEY `akey` (`a`) `dff`=vvv
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey1`='1v1'
|
|
drop table t1;
|
|
#reassiginig options in the same line
|
|
create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1=1v1 TKEY1=DEFAULT tkey1=1v2 tkey2=2v1;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'fkey'
|
|
Warning 1911 Unknown option 'dff'
|
|
Warning 1911 Unknown option 'tkey1'
|
|
Warning 1911 Unknown option 'tkey2'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey`=vvv,
|
|
KEY `akey` (`a`) `dff`=vvv
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey1`=1v2 `tkey2`=2v1
|
|
#add option
|
|
alter table t1 tkey4=4v1;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'tkey4'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey`=vvv,
|
|
KEY `akey` (`a`) `dff`=vvv
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey1`=1v2 `tkey2`=2v1 `tkey4`=4v1
|
|
#remove options
|
|
alter table t1 tkey3=DEFAULT tkey4=DEFAULT;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'tkey3'
|
|
Warning 1911 Unknown option 'tkey4'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey`=vvv,
|
|
KEY `akey` (`a`) `dff`=vvv
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey1`=1v2 `tkey2`=2v1
|
|
drop table t1;
|
|
create table t1 (a int fkey1=v1, key akey (a) kkey1=v1) tkey1=1v1 tkey1=1v2 TKEY1=DEFAULT tkey2=2v1 tkey3=3v1;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'fkey1'
|
|
Warning 1911 Unknown option 'kkey1'
|
|
Warning 1911 Unknown option 'TKEY1'
|
|
Warning 1911 Unknown option 'tkey2'
|
|
Warning 1911 Unknown option 'tkey3'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v1,
|
|
KEY `akey` (`a`) `kkey1`=v1
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#change field with option with the same value
|
|
alter table t1 change a a int `FKEY1`='v1';
|
|
Warnings:
|
|
Warning 1911 Unknown option 'FKEY1'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `FKEY1`='v1',
|
|
KEY `akey` (`a`) `kkey1`=v1
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#change field with option with a different value
|
|
alter table t1 change a a int fkey1=v2;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'fkey1'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v2,
|
|
KEY `akey` (`a`) `kkey1`=v1
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#new column no options
|
|
alter table t1 add column b int;
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v2,
|
|
`b` int(11) DEFAULT NULL,
|
|
KEY `akey` (`a`) `kkey1`=v1
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#new key with options
|
|
alter table t1 add key bkey (b) kkey2=v1;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'kkey2'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v2,
|
|
`b` int(11) DEFAULT NULL,
|
|
KEY `akey` (`a`) `kkey1`=v1,
|
|
KEY `bkey` (`b`) `kkey2`=v1
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#new column with options
|
|
alter table t1 add column c int fkey1=v1 fkey2=v2;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'fkey1'
|
|
Warning 1911 Unknown option 'fkey2'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v2,
|
|
`b` int(11) DEFAULT NULL,
|
|
`c` int(11) DEFAULT NULL `fkey1`=v1 `fkey2`=v2,
|
|
KEY `akey` (`a`) `kkey1`=v1,
|
|
KEY `bkey` (`b`) `kkey2`=v1
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#new key no options
|
|
alter table t1 add key ckey (c);
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v2,
|
|
`b` int(11) DEFAULT NULL,
|
|
`c` int(11) DEFAULT NULL `fkey1`=v1 `fkey2`=v2,
|
|
KEY `akey` (`a`) `kkey1`=v1,
|
|
KEY `bkey` (`b`) `kkey2`=v1,
|
|
KEY `ckey` (`c`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#drop column
|
|
alter table t1 drop b;
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v2,
|
|
`c` int(11) DEFAULT NULL `fkey1`=v1 `fkey2`=v2,
|
|
KEY `akey` (`a`) `kkey1`=v1,
|
|
KEY `ckey` (`c`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#add column with options after delete
|
|
alter table t1 add column b int fkey2=v1;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'fkey2'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v2,
|
|
`c` int(11) DEFAULT NULL `fkey1`=v1 `fkey2`=v2,
|
|
`b` int(11) DEFAULT NULL `fkey2`=v1,
|
|
KEY `akey` (`a`) `kkey1`=v1,
|
|
KEY `ckey` (`c`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
#add key
|
|
alter table t1 add key bkey (b) kkey2=v2;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'kkey2'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL `fkey1`=v2,
|
|
`c` int(11) DEFAULT NULL `fkey1`=v1 `fkey2`=v2,
|
|
`b` int(11) DEFAULT NULL `fkey2`=v1,
|
|
KEY `akey` (`a`) `kkey1`=v1,
|
|
KEY `ckey` (`c`),
|
|
KEY `bkey` (`b`) `kkey2`=v2
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey2`=2v1 `tkey3`=3v1
|
|
drop table t1;
|
|
create table t1 (a int) tkey1=100;
|
|
Warnings:
|
|
Warning 1911 Unknown option 'tkey1'
|
|
show create table t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 `tkey1`=100
|
|
drop table t1;
|
|
#error on unknown option
|
|
SET SQL_MODE='';
|
|
create table t1 (a int fkey=vvv, key akey (a) dff=vvv) tkey1=1v1;
|
|
ERROR HY000: Unknown option 'fkey'
|
|
SET @@SQL_MODE=@OLD_SQL_MODE;
|