1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge work.mysql.com:/home/bk/mysql

Browse Source 
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
This commit is contained in:
unknown 2001-03-02 05:05:06 -06:00
commit a1a773b509
24 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -1,4 +1,5 @@
heikki@donna.mysql.fi
jcole@tetra.spaceapes.com
mwagner@evoq.mwagner.org
sasha@mysql.sashanet.com
serg@serg.mysql.com

3
include/mysqld_error.h
View File

@ -204,4 +204,5 @@
#define ER_MASTER_INFO 1201
#define ER_SLAVE_THREAD 1202
#define ER_TOO_MANY_USER_CONNECTIONS 1203
#define ER_ERROR_MESSAGES 204
#define ER_SET_CONSTANTS_ONLY 1204
#define ER_ERROR_MESSAGES 205

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

@ -214,3 +214,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -208,3 +208,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -209,3 +209,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -208,3 +208,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -207,3 +207,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -207,3 +207,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -207,3 +207,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -207,3 +207,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -209,3 +209,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -209,3 +209,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -208,3 +208,4 @@
"îÅ ÐÏÌÕÞÉÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÓÔÒÕËÔÕÒÕ master info, ÐÒÏ×ÅÒÔÅ persmissions ÎÁ ÆÁÊÌÅ master.info",
"îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÐÒÏÃÅÓÓ SLAVE, ÐÒÏ×ÅÒØÔÅ ÓÉÓÔÅÍÎÙÅ ÒÅÓÕÒÓÙ",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",

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

@ -213,3 +213,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -206,3 +206,4 @@
"Could not initialize master info structure, check permisions on master.info",
"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",

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

@ -205,3 +205,4 @@
"Kunde inte initializera replications-strukturerna. Kontrollera privilegerna för 'master.info'",
"Kunde inte starta en tråd för replikering",
"Användare '%-.64s' har redan 'max_user_connections' aktiva inloggningar",
"You may only use constant expressions with SET",

2
sql/sql_yacc.yy
View File

@ -2666,7 +2666,7 @@ option_value:
{
Item_func_set_user_var *item = new Item_func_set_user_var($2,$4);
if (item->fix_fields(current_thd,0) || item->update())
YYABORT;
send_error(&current_thd->net, ER_SET_CONSTANTS_ONLY);
}
| SQL_SLAVE_SKIP_COUNTER equal ULONG_NUM
{