mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source 
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:
unknown 2001-09-17 23:26:00 +02:00
commit d8ae9669cd
38 changed files with 494 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -206,7 +206,7 @@
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
"Lock wait timeout exceeded",
"Lock wait timeout exceeded; Try restarting transaction",
"The total number of locks exceeds the lock table size",
"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
"DROP DATABASE not allowed while thread is holding global read lock",
@ -214,6 +214,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",