mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup after last merge

Browse source 
client/mysqltest.c:
  Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
  Made error messages more general
libmysqld/Makefile.am:
  md5 is now in mysys
mysql-test/include/have_isam.inc:
  Update to new result format
mysql-test/include/not_embedded.inc:
  Update to new result format
mysql-test/mysql-test-run.sh:
  Update to new result format
mysql-test/r/auto_increment.result:
  Update to new result format
mysql-test/r/count_distinct2.result:
  Update to new result format
mysql-test/r/create.result:
  Update to new result format
mysql-test/r/func_system.result:
  Update to new result format
mysql-test/r/isam.result:
  Update to new result format
mysql-test/r/lock.result:
  Update to new result format
mysql-test/r/lock_multi.result:
  Update to new result format
mysql-test/r/rename.result:
  Update to new result format
mysql-test/r/rpl000001.result:
  Fix wrong test
mysql-test/r/tablelock.result:
  Update to new result format
mysql-test/t/rename.test:
  Update to new result format
sql/share/czech/errmsg.txt:
  Made error messages more general
sql/share/danish/errmsg.txt:
  Made error messages more general
sql/share/dutch/errmsg.txt:
  Made error messages more general
sql/share/english/errmsg.txt:
  Made error messages more general
sql/share/estonian/errmsg.txt:
  Made error messages more general
sql/share/french/errmsg.txt:
  Made error messages more general
sql/share/german/errmsg.txt:
  Made error messages more general
sql/share/greek/errmsg.txt:
  Made error messages more general
sql/share/hungarian/errmsg.txt:
  Made error messages more general
sql/share/italian/errmsg.txt:
  Made error messages more general
sql/share/japanese/errmsg.txt:
  Made error messages more general
sql/share/korean/errmsg.txt:
  Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
  Made error messages more general
sql/share/norwegian/errmsg.txt:
  Made error messages more general
sql/share/polish/errmsg.txt:
  Made error messages more general
sql/share/portuguese/errmsg.txt:
  Made error messages more general
sql/share/romanian/errmsg.txt:
  Made error messages more general
sql/share/russian/errmsg.txt:
  Made error messages more general
sql/share/slovak/errmsg.txt:
  Made error messages more general
sql/share/spanish/errmsg.txt:
  Made error messages more general
sql/share/swedish/errmsg.txt:
  Made error messages more general
sql/share/ukrainian/errmsg.txt:
  Made error messages more general
sql/sql_lex.cc:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
  Cleanup
support-files/mysql.spec.sh:
  Create MySQL-embedded rpm
tools/mysqlmanager.c:
  Fix bug in merge
This commit is contained in:
unknown 2001-10-08 07:24:04 +03:00
commit 2ee21c9c46
44 changed files with 163 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/share/czech/errmsg.txt
View file

@ -231,6 +231,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/danish/errmsg.txt
View file

@ -225,6 +225,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/dutch/errmsg.txt
View file

@ -228,6 +228,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/english/errmsg.txt
View file

@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/estonian/errmsg.txt
View file

@ -226,6 +226,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/french/errmsg.txt
View file

@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/german/errmsg.txt
View file

@ -225,6 +225,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/greek/errmsg.txt
View file

@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/hungarian/errmsg.txt
View file

@ -224,6 +224,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/italian/errmsg.txt
View file

@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/japanese/errmsg.txt
View file

@ -224,6 +224,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/korean/errmsg.txt
View file

@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/norwegian-ny/errmsg.txt
View file

@ -224,6 +224,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/norwegian/errmsg.txt
View file

@ -224,6 +224,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/polish/errmsg.txt
View file

@ -226,6 +226,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/portuguese/errmsg.txt
View file

@ -222,6 +222,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/romanian/errmsg.txt
View file

@ -226,6 +226,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/russian/errmsg.txt
View file

@ -225,6 +225,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/slovak/errmsg.txt
View file

@ -230,6 +230,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/spanish/errmsg.txt
View file

@ -223,6 +223,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",

4
sql/share/swedish/errmsg.txt
View file

@ -222,6 +222,4 @@
"SELECT kommandona har olika antal kolumner"
"Kan inte utföra kommandot emedan du har ett READ lås",
"Blandning av transaktionella och icke-transaktionella tabeller är inaktiverat",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' användes två gånger",

4
sql/share/ukrainian/errmsg.txt
View file

@ -227,6 +227,4 @@
"The used SELECT statements have a different number of columns",
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Duplicate SUBJECT option in GRANT clause",
"Duplicate ISSUER option in GRANT clause",
"Duplicate CIPHER option in GRANT clause",
"Option '%s' used twice in statement",