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
a93be9f9
Commit
a93be9f9
authored
May 13, 2006
by
brian@zim.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/dep-5.1
parents
a70bfd6c
b283a969
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
95 additions
and
0 deletions
+95
-0
mysql-test/r/contributors.result
mysql-test/r/contributors.result
+5
-0
mysql-test/t/contributors.test
mysql-test/t/contributors.test
+1
-0
sql/contributors.h
sql/contributors.h
+40
-0
sql/lex.h
sql/lex.h
+1
-0
sql/mysql_priv.h
sql/mysql_priv.h
+1
-0
sql/sp_head.cc
sql/sp_head.cc
+1
-0
sql/sql_lex.h
sql/sql_lex.h
+1
-0
sql/sql_parse.cc
sql/sql_parse.cc
+3
-0
sql/sql_show.cc
sql/sql_show.cc
+36
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+6
-0
No files found.
mysql-test/r/contributors.result
0 → 100644
View file @
a93be9f9
SHOW CONTRIBUTORS;
Name Location Comment
Ronald Bradford Brisbane, Australia EFF contribution for UC2006 Auction
Sheeri Kritzer Boston, Mass. USA EFF contribution for UC2006 Auction
Mark Shuttleworth London, UK. EFF contribution for UC2006 Auction
mysql-test/t/contributors.test
0 → 100644
View file @
a93be9f9
SHOW
CONTRIBUTORS
;
sql/contributors.h
0 → 100644
View file @
a93be9f9
/* Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Structure of the name list */
struct
show_table_contributors_st
{
const
char
*
name
;
const
char
*
location
;
const
char
*
comment
;
};
/*
Output from "SHOW CONTRIBUTORS"
Get permission before editing.
IMPORTANT: Names should be left in historical order.
Names should be encoded using UTF-8.
*/
struct
show_table_contributors_st
show_table_contributors
[]
=
{
{
"Ronald Bradford"
,
"Brisbane, Australia"
,
"EFF contribution for UC2006 Auction"
},
{
"Sheeri Kritzer"
,
"Boston, Mass. USA"
,
"EFF contribution for UC2006 Auction"
},
{
"Mark Shuttleworth"
,
"London, UK."
,
"EFF contribution for UC2006 Auction"
},
{
NULL
,
NULL
,
NULL
}
};
sql/lex.h
View file @
a93be9f9
...
...
@@ -133,6 +133,7 @@ static SYMBOL symbols[] = {
{
"CONSTRAINT"
,
SYM
(
CONSTRAINT
)},
{
"CONTAINS"
,
SYM
(
CONTAINS_SYM
)},
{
"CONTINUE"
,
SYM
(
CONTINUE_SYM
)},
{
"CONTRIBUTORS"
,
SYM
(
CONTRIBUTORS_SYM
)},
{
"CONVERT"
,
SYM
(
CONVERT_SYM
)},
{
"CREATE"
,
SYM
(
CREATE
)},
{
"CROSS"
,
SYM
(
CROSS
)},
...
...
sql/mysql_priv.h
View file @
a93be9f9
...
...
@@ -1005,6 +1005,7 @@ int mysql_find_files(THD *thd,List<char> *files, const char *db,
const
char
*
path
,
const
char
*
wild
,
bool
dir
);
bool
mysqld_show_storage_engines
(
THD
*
thd
);
bool
mysqld_show_authors
(
THD
*
thd
);
bool
mysqld_show_contributors
(
THD
*
thd
);
bool
mysqld_show_privileges
(
THD
*
thd
);
bool
mysqld_show_column_types
(
THD
*
thd
);
bool
mysqld_help
(
THD
*
thd
,
const
char
*
text
);
...
...
sql/sp_head.cc
View file @
a93be9f9
...
...
@@ -202,6 +202,7 @@ sp_get_flags_for_command(LEX *lex)
case
SQLCOM_SHOW_PROC_CODE
:
case
SQLCOM_SHOW_FUNC_CODE
:
case
SQLCOM_SHOW_AUTHORS
:
case
SQLCOM_SHOW_CONTRIBUTORS
:
case
SQLCOM_REPAIR
:
case
SQLCOM_BACKUP_TABLE
:
case
SQLCOM_RESTORE_TABLE
:
...
...
sql/sql_lex.h
View file @
a93be9f9
...
...
@@ -110,6 +110,7 @@ enum enum_sql_command {
SQLCOM_INSTALL_PLUGIN
,
SQLCOM_UNINSTALL_PLUGIN
,
SQLCOM_SHOW_AUTHORS
,
SQLCOM_BINLOG_BASE64_EVENT
,
SQLCOM_SHOW_PLUGINS
,
SQLCOM_SHOW_CONTRIBUTORS
,
SQLCOM_CREATE_EVENT
,
SQLCOM_ALTER_EVENT
,
SQLCOM_DROP_EVENT
,
SQLCOM_SHOW_CREATE_EVENT
,
SQLCOM_SHOW_EVENTS
,
...
...
sql/sql_parse.cc
View file @
a93be9f9
...
...
@@ -3529,6 +3529,9 @@ end_with_restore_list:
case
SQLCOM_SHOW_AUTHORS
:
res
=
mysqld_show_authors
(
thd
);
break
;
case
SQLCOM_SHOW_CONTRIBUTORS
:
res
=
mysqld_show_contributors
(
thd
);
break
;
case
SQLCOM_SHOW_PRIVILEGES
:
res
=
mysqld_show_privileges
(
thd
);
break
;
...
...
sql/sql_show.cc
View file @
a93be9f9
...
...
@@ -25,6 +25,7 @@
#include "sp_head.h"
#include "sql_trigger.h"
#include "authors.h"
#include "contributors.h"
#include "event.h"
#include <my_dir.h>
...
...
@@ -229,6 +230,41 @@ bool mysqld_show_authors(THD *thd)
DBUG_RETURN
(
FALSE
);
}
/***************************************************************************
** List all Contributors.
** Please get permission before updating
***************************************************************************/
bool
mysqld_show_contributors
(
THD
*
thd
)
{
List
<
Item
>
field_list
;
Protocol
*
protocol
=
thd
->
protocol
;
DBUG_ENTER
(
"mysqld_show_contributors"
);
field_list
.
push_back
(
new
Item_empty_string
(
"Name"
,
40
));
field_list
.
push_back
(
new
Item_empty_string
(
"Location"
,
40
));
field_list
.
push_back
(
new
Item_empty_string
(
"Comment"
,
80
));
if
(
protocol
->
send_fields
(
&
field_list
,
Protocol
::
SEND_NUM_ROWS
|
Protocol
::
SEND_EOF
))
DBUG_RETURN
(
TRUE
);
show_table_contributors_st
*
contributors
;
for
(
contributors
=
show_table_contributors
;
contributors
->
name
;
contributors
++
)
{
protocol
->
prepare_for_resend
();
protocol
->
store
(
contributors
->
name
,
system_charset_info
);
protocol
->
store
(
contributors
->
location
,
system_charset_info
);
protocol
->
store
(
contributors
->
comment
,
system_charset_info
);
if
(
protocol
->
write
())
DBUG_RETURN
(
TRUE
);
}
send_eof
(
thd
);
DBUG_RETURN
(
FALSE
);
}
/***************************************************************************
List all privileges supported
***************************************************************************/
...
...
sql/sql_yacc.yy
View file @
a93be9f9
...
...
@@ -204,6 +204,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%token CONSTRAINT
%token CONTAINS_SYM
%token CONTINUE_SYM
%token CONTRIBUTORS_SYM
%token CONVERT_SYM
%token CONVERT_TZ_SYM
%token COUNT_SYM
...
...
@@ -8170,6 +8171,11 @@ show_param:
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_AUTHORS;
}
| CONTRIBUTORS_SYM
{
LEX *lex=Lex;
lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
}
| PRIVILEGES
{
LEX *lex=Lex;
...
...
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