mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 20:25:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

post-merge fixes to make it compile. It still fails the fulltext test,

Browse source 
(wrong error code) but I'll push it so that Sergei could clean up
 my merge


include/mysqld_error.h:
  fixed typo
mysql-test/r/order_by.result:
  updated result for merged test
sql/Makefile.am:
  put back sql_union.cc lost during merge
sql/mysql_priv.h:
  restored variables lost in the merge
sql/mysqld.cc:
  put back lost variable declarations
sql/share/czech/errmsg.txt:
  merge fix
sql/share/danish/errmsg.txt:
  merge fix
sql/share/dutch/errmsg.txt:
  merge fix
sql/share/english/errmsg.txt:
  merge fix
sql/share/estonian/errmsg.txt:
  merge fix
sql/share/french/errmsg.txt:
  merge fix
sql/share/german/errmsg.txt:
  merge fix
sql/share/greek/errmsg.txt:
  merge fix
sql/share/hungarian/errmsg.txt:
  merge fix
sql/share/italian/errmsg.txt:
  merge fix
sql/share/japanese/errmsg.txt:
  merge fix
sql/share/korean/errmsg.txt:
  merge fix
sql/share/norwegian-ny/errmsg.txt:
  merge fix
sql/share/norwegian/errmsg.txt:
  merge fix
sql/share/polish/errmsg.txt:
  merge fix
sql/share/portuguese/errmsg.txt:
  merge fix
sql/share/romanian/errmsg.txt:
  merge fix
sql/share/russian/errmsg.txt:
  merge fix
sql/share/slovak/errmsg.txt:
  merge fix
sql/share/spanish/errmsg.txt:
  merge fix
sql/share/swedish/errmsg.txt:
  merge fix
sql/sql_acl.cc:
  merge fix
This commit is contained in:
unknown 2001-08-11 19:54:31 -06:00
commit 2aed7cf90e
27 changed files with 65 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -226,3 +226,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -220,3 +220,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -221,3 +221,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -220,3 +220,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -219,3 +219,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -219,3 +219,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -219,3 +219,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -219,3 +219,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -221,3 +221,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -217,3 +217,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -221,3 +221,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -220,3 +220,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -225,3 +225,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -218,3 +218,4 @@
"Error de %s: %-128%",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
"%-.32s@%-.64s is not allowed to create new users",

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

@ -217,3 +217,4 @@
"Fick fel vid utförande av %s: %-.128s",
"Felaktig använding av %s and %s",
"SELECT kommandona har olika antal kolumner"
"%-.32s@%-.64s is not allowed to create new users",