diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-08-31 04:56:09 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-31 04:56:09 -0400 |
| commit | 45fc29b7d94f32923fb7a09a440d3e0d8e4a75fa (patch) | |
| tree | c96decd336271df3edf2bab41126ec0ad3034be3 /sql/share | |
| parent | 86d29fdf5ba12d20d0f67338ba42532b2c8d0072 (diff) | |
| parent | fb338e6c4049c3993cbf59c90e9757767b19c47c (diff) | |
| download | mariadb-git-45fc29b7d94f32923fb7a09a440d3e0d8e4a75fa.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
into dator5.(none):/home/pappa/push_clone
mysql-test/r/partition.result:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 1befd15fe9d..2228ded870b 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5702,9 +5702,7 @@ ER_BLOB_FIELD_IN_PART_FUNC_ERROR ger "In der Partitionierungsfunktion sind BLOB-Spalten nicht erlaubt" swe "Ett BLOB-fält är inte tillåtet i partitioneringsfunktioner" ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF - eng "A %-.64s need to include all fields in the partition function" - ger "Ein %-.64s muss alle Spalten der Partitionierungsfunktion umfassen" - swe "En %-.64s behöver inkludera alla fält i partitioneringsfunktionen för denna lagringsmotor" + eng "A %-.64s must include all columns in the table's partitioning function" ER_NO_PARTS_ERROR eng "Number of %-.64s = 0 is not an allowed value" ger "Eine Anzahl von %-.64s = 0 ist kein erlaubter Wert" |