mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
merge
Docs/manual.texi: Auto merged extra/perror.c: Auto merged include/my_base.h: Auto merged include/mysql.h: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_berkeley.cc: Auto merged sql/handler.h: Auto merged sql/mysqld.cc: Auto merged client/mysqltest.c: Auto merged
This commit is contained in:
commit
d8ae9669cd
38 changed files with 494 additions and 173 deletions
|
|
@ -218,6 +218,7 @@
|
|||
"Wrong arguments to %s",
|
||||
"%-.32s@%-.64s is not allowed to create new users",
|
||||
"Incorrect table definition; All MERGE tables must be in the same database",
|
||||
"Deadlock found when trying to get lock; Try restarting transaction",
|
||||
"Error connecting to master: %-.128s",
|
||||
"Error running query on master: %-.128s",
|
||||
"Error when executing command %s: %-.128s",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue