MDEV-21889 Typo fix: ER_KEY_DOES_NOT_EXISTS

libmariadb revision updated.

libmariadb @ 9c849582

-Subproject commit 7a2c052ffc8b93acaa1e4de502c83cbae548148c
+Subproject commit 9c84958266a7fc61cd5b31b623cf4e26c3320713

mysql-test/main/alter_table.test

@@ -2291,13 +2291,13 @@ show create table t1;
 
 --echo # 1.b) It should be impossible to rename index that doesn't
 --echo #      exists, dropped or added within the same ALTER TABLE.
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 alter table t1 rename key d to e;
 show create table t1;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 alter table t1 drop key c, rename key c to d;
 show create table t1;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 alter table t1 add key d(j), rename key d to e;
 show create table t1;
 

mysql-test/main/explain.test

@@ -130,7 +130,7 @@ DROP TABLE t1,t2;
 
 CREATE TABLE t1 (a INT PRIMARY KEY);
 
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 EXPLAIN EXTENDED SELECT COUNT(a) FROM t1 USE KEY(a);
 
 DROP TABLE t1;

mysql-test/main/view.test

@@ -510,7 +510,7 @@ drop table t1;
 #
 create table t1 (a int, b int);
 create view v1 as select a, sum(b) from t1 group by a;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 select b from v1 use index (some_index) where b=1;
 drop view v1;
 drop table t1;
@@ -3470,11 +3470,11 @@ drop table t1;
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1),(2);
 CREATE VIEW v1 AS SELECT * FROM t1;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 USE KEY(non_existant);
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 FORCE KEY(non_existant);
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 IGNORE KEY(non_existant);
 
 DROP VIEW v1;
@@ -3629,17 +3629,17 @@ SELECT * FROM t1 USE INDEX (c2) WHERE c2=2;
 
 CREATE VIEW v1 AS SELECT c1, c2 FROM t1;
 SHOW INDEX FROM v1;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 USE INDEX (PRIMARY) WHERE c1=2;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 FORCE INDEX (PRIMARY) WHERE c1=2;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 IGNORE INDEX (PRIMARY) WHERE c1=2;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 USE INDEX (c2) WHERE c2=2;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 FORCE INDEX (c2) WHERE c2=2;
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT * FROM v1 IGNORE INDEX (c2) WHERE c2=2;
 
 DROP VIEW v1;

mysql-test/suite/innodb/t/innodb_rename_index.test

@@ -65,12 +65,12 @@ ALTER TABLE t RENAME INDEX i1 TO GEN_CLUST_INDEX;
 # Index creation on non-existing columns will not be tested.
 
 ALTER TABLE t RENAME INDEX i1 TO i1;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t RENAME INDEX aa TO aa;
 
 -- echo # combination: aaaa
 # drop/add existing, null rename and drop the same
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i4(f), DROP INDEX i4, RENAME INDEX i4 TO i4;
 
 -- echo # combination: aabb
@@ -78,7 +78,7 @@ ALTER TABLE t ADD INDEX i4(f), DROP INDEX i4, RENAME INDEX i4 TO i4;
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX aa, RENAME INDEX i2 TO i2;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX aa, RENAME INDEX bb TO bb;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i1, RENAME INDEX bb TO bb;
 
 -- enable_info
@@ -96,7 +96,7 @@ DROP TABLE t;
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX bb, RENAME INDEX cc TO cc;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX bb, RENAME INDEX i3 TO i3;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX i2, RENAME INDEX cc TO cc;
 
 # rename existing (succeeds)
@@ -111,7 +111,7 @@ DROP TABLE t;
 
 -- echo # combination: abaa
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX i1, RENAME INDEX aa TO aa;
 -- error ER_DUP_KEYNAME
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i2, RENAME INDEX i1 TO i1;
@@ -122,9 +122,9 @@ ALTER TABLE t ADD INDEX aa(f), DROP INDEX bb, RENAME INDEX aa TO aa;
 
 -- echo # combination: baaa
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i2(f), DROP INDEX i1, RENAME INDEX i1 TO i1;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX bb(f), DROP INDEX i1, RENAME INDEX i1 TO i1;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX i2(f), DROP INDEX aa, RENAME INDEX aa TO aa;
@@ -136,9 +136,9 @@ ALTER TABLE t ADD INDEX bb(f), DROP INDEX aa, RENAME INDEX aa TO aa;
 # a.k.a. aaaa abba cabc aaba abaa
 # the case w=y (ADD w, RENAME w to z) may succeed, as seen below
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), RENAME INDEX aa TO bb;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), RENAME INDEX bb TO aa;
 -- error ER_DUP_KEYNAME
 ALTER TABLE t ADD INDEX aa(f), RENAME INDEX i2 TO aa;
@@ -155,9 +155,9 @@ DROP TABLE t;
 
 -- echo # combination: abba
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i2, RENAME INDEX i2 TO i1;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX i2, RENAME INDEX i2 TO aa;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX bb, RENAME INDEX bb TO i1;
@@ -170,7 +170,7 @@ ALTER TABLE t ADD INDEX aa(f), DROP INDEX bb, RENAME INDEX bb TO aa;
 ALTER TABLE t ADD INDEX i3(f), DROP INDEX i1, RENAME INDEX i2 TO i3;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX i3(f), DROP INDEX aa, RENAME INDEX i2 TO i3;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i3(f), DROP INDEX i1, RENAME INDEX bb TO i3;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX i3(f), DROP INDEX aa, RENAME INDEX bb TO i3;
@@ -179,7 +179,7 @@ ALTER TABLE t ADD INDEX i3(f), DROP INDEX aa, RENAME INDEX bb TO i3;
 ALTER TABLE t ADD INDEX cc(f), DROP INDEX i1, RENAME INDEX i2 TO cc;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX cc(f), DROP INDEX aa, RENAME INDEX i2 TO cc;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX cc(f), DROP INDEX i1, RENAME INDEX bb TO cc;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX cc(f), DROP INDEX aa, RENAME INDEX bb TO cc;
@@ -189,7 +189,7 @@ ALTER TABLE t ADD INDEX cc(f), DROP INDEX aa, RENAME INDEX bb TO cc;
 # a.k.a. aaaa abba accb aaab baaa
 
 # rename and drop the same
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t DROP INDEX i1, RENAME INDEX i1 TO bb;
 # drop non-existing
 -- error ER_CANT_DROP_FIELD_OR_KEY
@@ -209,9 +209,9 @@ DROP TABLE t;
 
 -- echo # combination: accb
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i3, RENAME INDEX i3 TO i2;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i3, RENAME INDEX i3 TO bb;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX cc, RENAME INDEX cc TO i2;
@@ -224,11 +224,11 @@ ALTER TABLE t ADD INDEX aa(f), DROP INDEX cc, RENAME INDEX cc TO bb;
 
 -- echo # combination: aaab
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i1, RENAME INDEX i1 TO i2;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i1, RENAME INDEX i1 TO bb;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i1, RENAME INDEX i1 TO i2;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX aa, RENAME INDEX aa TO bb;
@@ -237,13 +237,13 @@ ALTER TABLE t ADD INDEX aa(f), DROP INDEX aa, RENAME INDEX aa TO bb;
 
 -- echo # combination: abcd
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i2, RENAME INDEX cc TO i4;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i2, RENAME INDEX cc TO dd;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX i2, RENAME INDEX cc TO i4;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX i2, RENAME INDEX cc TO dd;
 
 # add existing, rename to existing
@@ -278,7 +278,7 @@ DROP TABLE t;
 
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX bb, RENAME INDEX i1 TO bb;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX i2, RENAME INDEX aa TO i2;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX bb, RENAME INDEX aa TO bb;
@@ -293,9 +293,9 @@ ALTER TABLE t ADD INDEX aa(f), DROP INDEX cc, RENAME INDEX i2 TO cc;
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX cc, RENAME INDEX bb TO cc;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX cc, RENAME INDEX bb TO cc;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1(f), DROP INDEX i3, RENAME INDEX bb TO i3;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX aa(f), DROP INDEX i3, RENAME INDEX bb TO i3;
 
 # add existing
@@ -313,13 +313,13 @@ DROP TABLE t;
 
 -- echo # combination: cacb
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX cc(f), DROP INDEX i1, RENAME INDEX cc TO i2;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX cc(f), DROP INDEX aa, RENAME INDEX cc TO i2;
 -- error ER_CANT_DROP_FIELD_OR_KEY
 ALTER TABLE t ADD INDEX cc(f), DROP INDEX aa, RENAME INDEX cc TO bb;
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX cc(f), DROP INDEX i1, RENAME INDEX cc TO bb;
 
 -- error ER_DUP_KEYNAME
@@ -378,7 +378,7 @@ DROP TABLE t;
 -- error ER_DUP_KEYNAME
 ALTER TABLE t RENAME INDEX i1 TO i2;
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t RENAME INDEX foo TO i1;
 
 # Test ADD INDEX, RENAME INDEX
@@ -406,7 +406,7 @@ ALTER TABLE t ADD INDEX foo (f), RENAME INDEX i1 TO foo;
 
 # Test ADD INDEX, RENAME INDEX, DROP INDEX
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t ADD INDEX i1 (f), RENAME INDEX i1 TO foo, DROP INDEX i1;
 
 -- error ER_CANT_DROP_FIELD_OR_KEY
@@ -422,10 +422,10 @@ ALTER TABLE t ADD INDEX foo (f), RENAME INDEX foo TO bar, DROP INDEX foo;
 -- error ER_DUP_KEYNAME
 ALTER TABLE t RENAME INDEX i1 TO x, RENAME INDEX i2 TO x;
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t RENAME INDEX i1 TO x, RENAME INDEX i1 TO y;
 
--- error ER_KEY_DOES_NOT_EXITS
+-- error ER_KEY_DOES_NOT_EXISTS
 ALTER TABLE t RENAME INDEX i1 TO x, RENAME INDEX i1 TO x;
 
 # show that the table did not change after all the erroneous ALTERs

sql/share/errmsg-utf8.txt

@@ -3919,7 +3919,7 @@ ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE
         spa "Tu estás usando modo de actualización segura y tentado actualizar una tabla sin un WHERE que usa una KEY columna"
         swe "Du använder 'säker uppdateringsmod' och försökte uppdatera en tabell utan en WHERE-sats som använder sig av en nyckel"
         ukr "Ви у режимі безпечного оновлення та намагаєтесь оновити таблицю без оператора WHERE, що використовує KEY стовбець"
-ER_KEY_DOES_NOT_EXITS 42000 S1009
+ER_KEY_DOES_NOT_EXISTS 42000 S1009
         cze "Klíč '%-.192s' v tabulce '%-.192s' neexistuje"
         dan "Nøglen '%-.192s' eksisterer ikke i tabellen '%-.192s'"
         nla "Zoeksleutel '%-.192s' bestaat niet in tabel '%-.192s'"

sql/sql_base.cc

@@ -7864,7 +7864,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
                         name->length(), 1)) <=
         0)
     {
-      my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
+      my_error(ER_KEY_DOES_NOT_EXISTS, MYF(0), name->c_ptr(),
 	       table->pos_in_table_list->alias.str);
       map->set_all();
       return 1;

sql/sql_handler.cc

@@ -641,7 +641,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler,
       if ((handler->keyno= find_type(keyname, &table->s->keynames,
                                      FIND_TYPE_NO_PREFIX) - 1) < 0)
       {
-        my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), keyname,
+        my_error(ER_KEY_DOES_NOT_EXISTS, MYF(0), keyname,
                  handler->handler_name.str);
         return 1;
       }

sql/sql_table.cc

@@ -8908,7 +8908,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
 
   if (rename_key_list.elements)
   {
-    my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), rename_key_list.head()->old_name.str,
+    my_error(ER_KEY_DOES_NOT_EXISTS, MYF(0), rename_key_list.head()->old_name.str,
              table->s->table_name.str);
     goto err;
   }

sql/sql_view.cc

@@ -1214,7 +1214,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
 
   if (table->index_hints && table->index_hints->elements)
   {
-    my_error(ER_KEY_DOES_NOT_EXITS, MYF(0),
+    my_error(ER_KEY_DOES_NOT_EXISTS, MYF(0),
              table->index_hints->head()->key_name.str, table->table_name.str);
     DBUG_RETURN(TRUE);
   }

sql/table.cc

@@ -8133,7 +8133,7 @@ bool TABLE_LIST::process_index_hints(TABLE *tbl)
           (pos= find_type(&tbl->s->keynames, hint->key_name.str,
                           hint->key_name.length, 1)) <= 0)
       {
-        my_error(ER_KEY_DOES_NOT_EXITS, MYF(0), hint->key_name.str, alias.str);
+        my_error(ER_KEY_DOES_NOT_EXISTS, MYF(0), hint->key_name.str, alias.str);
         return 1;
       }
 

storage/rocksdb/mysql-test/rocksdb/t/issue900.test

@@ -8,6 +8,6 @@ INSERT INTO t1 VALUES('1','0','1');
 # Would segfault here
 --error ER_DUP_ENTRY
 ALTER TABLE t1 ADD INDEX(c3), ADD UNIQUE (c3);
---error ER_KEY_DOES_NOT_EXITS
+--error ER_KEY_DOES_NOT_EXISTS
 SELECT c3 FROM t1 FORCE INDEX(c3) ORDER BY c3;
 DROP TABLE t1;