Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
d87f4998
Commit
d87f4998
authored
23 years ago
by
jcole@tetra.spaceapes.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work.mysql.com:/home/bk/mysql
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
parents
ebf34516
ab60ef6d
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
25 additions
and
2 deletions
+25
-2
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
include/mysqld_error.h
include/mysqld_error.h
+2
-1
sql/share/czech/errmsg.txt
sql/share/czech/errmsg.txt
+1
-0
sql/share/danish/errmsg.txt
sql/share/danish/errmsg.txt
+1
-0
sql/share/dutch/errmsg.txt
sql/share/dutch/errmsg.txt
+1
-0
sql/share/english/errmsg.txt
sql/share/english/errmsg.txt
+1
-0
sql/share/estonian/errmsg.txt
sql/share/estonian/errmsg.txt
+1
-0
sql/share/french/errmsg.txt
sql/share/french/errmsg.txt
+1
-0
sql/share/german/errmsg.txt
sql/share/german/errmsg.txt
+1
-0
sql/share/greek/errmsg.txt
sql/share/greek/errmsg.txt
+1
-0
sql/share/hungarian/errmsg.txt
sql/share/hungarian/errmsg.txt
+1
-0
sql/share/italian/errmsg.txt
sql/share/italian/errmsg.txt
+1
-0
sql/share/japanese/errmsg.txt
sql/share/japanese/errmsg.txt
+1
-0
sql/share/korean/errmsg.txt
sql/share/korean/errmsg.txt
+1
-0
sql/share/norwegian-ny/errmsg.txt
sql/share/norwegian-ny/errmsg.txt
+1
-0
sql/share/norwegian/errmsg.txt
sql/share/norwegian/errmsg.txt
+1
-0
sql/share/polish/errmsg.txt
sql/share/polish/errmsg.txt
+1
-0
sql/share/portuguese/errmsg.txt
sql/share/portuguese/errmsg.txt
+1
-0
sql/share/romanian/errmsg.txt
sql/share/romanian/errmsg.txt
+1
-0
sql/share/russian/errmsg.txt
sql/share/russian/errmsg.txt
+1
-0
sql/share/slovak/errmsg.txt
sql/share/slovak/errmsg.txt
+1
-0
sql/share/spanish/errmsg.txt
sql/share/spanish/errmsg.txt
+1
-0
sql/share/swedish/errmsg.txt
sql/share/swedish/errmsg.txt
+1
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-1
No files found.
BitKeeper/etc/logging_ok
View file @
d87f4998
heikki@donna.mysql.fi
heikki@donna.mysql.fi
jcole@tetra.spaceapes.com
mwagner@evoq.mwagner.org
mwagner@evoq.mwagner.org
sasha@mysql.sashanet.com
sasha@mysql.sashanet.com
serg@serg.mysql.com
serg@serg.mysql.com
This diff is collapsed.
Click to expand it.
include/mysqld_error.h
View file @
d87f4998
...
@@ -204,4 +204,5 @@
...
@@ -204,4 +204,5 @@
#define ER_MASTER_INFO 1201
#define ER_MASTER_INFO 1201
#define ER_SLAVE_THREAD 1202
#define ER_SLAVE_THREAD 1202
#define ER_TOO_MANY_USER_CONNECTIONS 1203
#define ER_TOO_MANY_USER_CONNECTIONS 1203
#define ER_ERROR_MESSAGES 204
#define ER_SET_CONSTANTS_ONLY 1204
#define ER_ERROR_MESSAGES 205
This diff is collapsed.
Click to expand it.
sql/share/czech/errmsg.txt
View file @
d87f4998
...
@@ -214,3 +214,4 @@
...
@@ -214,3 +214,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/danish/errmsg.txt
View file @
d87f4998
...
@@ -208,3 +208,4 @@
...
@@ -208,3 +208,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/dutch/errmsg.txt
View file @
d87f4998
...
@@ -205,3 +205,4 @@
...
@@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/english/errmsg.txt
View file @
d87f4998
...
@@ -205,3 +205,4 @@
...
@@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/estonian/errmsg.txt
View file @
d87f4998
...
@@ -209,3 +209,4 @@
...
@@ -209,3 +209,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/french/errmsg.txt
View file @
d87f4998
...
@@ -205,3 +205,4 @@
...
@@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/german/errmsg.txt
View file @
d87f4998
...
@@ -208,3 +208,4 @@
...
@@ -208,3 +208,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/greek/errmsg.txt
View file @
d87f4998
...
@@ -205,3 +205,4 @@
...
@@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/hungarian/errmsg.txt
View file @
d87f4998
...
@@ -207,3 +207,4 @@
...
@@ -207,3 +207,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/italian/errmsg.txt
View file @
d87f4998
...
@@ -205,3 +205,4 @@
...
@@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/japanese/errmsg.txt
View file @
d87f4998
...
@@ -207,3 +207,4 @@
...
@@ -207,3 +207,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/korean/errmsg.txt
View file @
d87f4998
...
@@ -205,3 +205,4 @@
...
@@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/norwegian-ny/errmsg.txt
View file @
d87f4998
...
@@ -207,3 +207,4 @@
...
@@ -207,3 +207,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/norwegian/errmsg.txt
View file @
d87f4998
...
@@ -207,3 +207,4 @@
...
@@ -207,3 +207,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/polish/errmsg.txt
View file @
d87f4998
...
@@ -209,3 +209,4 @@
...
@@ -209,3 +209,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/portuguese/errmsg.txt
View file @
d87f4998
...
@@ -205,3 +205,4 @@
...
@@ -205,3 +205,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/romanian/errmsg.txt
View file @
d87f4998
...
@@ -209,3 +209,4 @@
...
@@ -209,3 +209,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/russian/errmsg.txt
View file @
d87f4998
...
@@ -208,3 +208,4 @@
...
@@ -208,3 +208,4 @@
" master info, persmissions master.info",
" master info, persmissions master.info",
" SLAVE, ",
" SLAVE, ",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/slovak/errmsg.txt
View file @
d87f4998
...
@@ -213,3 +213,4 @@
...
@@ -213,3 +213,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/spanish/errmsg.txt
View file @
d87f4998
...
@@ -206,3 +206,4 @@
...
@@ -206,3 +206,4 @@
"Could not initialize master info structure, check permisions on master.info",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/share/swedish/errmsg.txt
View file @
d87f4998
...
@@ -205,3 +205,4 @@
...
@@ -205,3 +205,4 @@
"Kunde inte initializera replications-strukturerna. Kontrollera privilegerna för 'master.info'",
"Kunde inte initializera replications-strukturerna. Kontrollera privilegerna för 'master.info'",
"Kunde inte starta en tråd för replikering",
"Kunde inte starta en tråd för replikering",
"Användare '%-.64s' har redan 'max_user_connections' aktiva inloggningar",
"Användare '%-.64s' har redan 'max_user_connections' aktiva inloggningar",
"You may only use constant expressions with SET",
This diff is collapsed.
Click to expand it.
sql/sql_yacc.yy
View file @
d87f4998
...
@@ -2666,7 +2666,7 @@ option_value:
...
@@ -2666,7 +2666,7 @@ option_value:
{
{
Item_func_set_user_var *item = new Item_func_set_user_var($2,$4);
Item_func_set_user_var *item = new Item_func_set_user_var($2,$4);
if (item->fix_fields(current_thd,0) || item->update())
if (item->fix_fields(current_thd,0) || item->update())
YYABORT
;
send_error(¤t_thd->net, ER_SET_CONSTANTS_ONLY)
;
}
}
| SQL_SLAVE_SKIP_COUNTER equal ULONG_NUM
| SQL_SLAVE_SKIP_COUNTER equal ULONG_NUM
{
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment