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
df52ae2a
Commit
df52ae2a
authored
Jan 02, 2006
by
knielsen@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/mysql/mysql-5.1-new
parents
afbbaa97
a51bce1b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
include/my_bitmap.h
include/my_bitmap.h
+2
-0
mysql-test/Makefile.am
mysql-test/Makefile.am
+2
-1
sql/rpl_tblmap.h
sql/rpl_tblmap.h
+0
-4
sql/sql_plugin.cc
sql/sql_plugin.cc
+3
-3
No files found.
include/my_bitmap.h
View file @
df52ae2a
...
@@ -17,7 +17,9 @@
...
@@ -17,7 +17,9 @@
#ifndef _my_bitmap_h_
#ifndef _my_bitmap_h_
#define _my_bitmap_h_
#define _my_bitmap_h_
#ifdef THREAD
#include <my_pthread.h>
#include <my_pthread.h>
#endif
#define MY_BIT_NONE (~(uint) 0)
#define MY_BIT_NONE (~(uint) 0)
...
...
mysql-test/Makefile.am
View file @
df52ae2a
...
@@ -49,7 +49,8 @@ dist-hook:
...
@@ -49,7 +49,8 @@ dist-hook:
-
$(INSTALL_DATA)
$(srcdir)
/t/
*
.imtest
$(distdir)
/t
-
$(INSTALL_DATA)
$(srcdir)
/t/
*
.imtest
$(distdir)
/t
$(INSTALL_DATA)
$(srcdir)
/t/
*
.sql
$(distdir)
/t
$(INSTALL_DATA)
$(srcdir)
/t/
*
.sql
$(distdir)
/t
-
$(INSTALL_DATA)
$(srcdir)
/t/
*
.disabled
$(distdir)
/t
-
$(INSTALL_DATA)
$(srcdir)
/t/
*
.disabled
$(distdir)
/t
$(INSTALL_DATA)
$(srcdir)
/t/
*
.opt
$(srcdir)
/t/
*
.sh
$(srcdir)
/t/
*
.slave-mi
$(distdir)
/t
$(INSTALL_DATA)
$(srcdir)
/t/
*
.opt
$(srcdir)
/t/
*
.slave-mi
$(distdir)
/t
$(INSTALL_SCRIPT)
$(srcdir)
/t/
*
.sh
$(distdir)
/t
$(INSTALL_DATA)
$(srcdir)
/extra/binlog_tests/
*
.test
$(distdir)
/extra/binlog_tests
$(INSTALL_DATA)
$(srcdir)
/extra/binlog_tests/
*
.test
$(distdir)
/extra/binlog_tests
$(INSTALL_DATA)
$(srcdir)
/extra/rpl_tests/
*
.test
$(distdir)
/extra/rpl_tests
$(INSTALL_DATA)
$(srcdir)
/extra/rpl_tests/
*
.test
$(distdir)
/extra/rpl_tests
-
$(INSTALL_DATA)
$(srcdir)
/extra/binlog_tests/
*
.opt
$(distdir)
/extra/binlog_tests
-
$(INSTALL_DATA)
$(srcdir)
/extra/binlog_tests/
*
.opt
$(distdir)
/extra/binlog_tests
...
...
sql/rpl_tblmap.h
View file @
df52ae2a
...
@@ -54,10 +54,6 @@ private:
...
@@ -54,10 +54,6 @@ private:
public:
public:
enum
{
NO_TABLE
=
ULONG_MAX
};
enum
enum_error
{
enum
enum_error
{
ERR_NO_ERROR
=
0
,
ERR_NO_ERROR
=
0
,
ERR_LIMIT_EXCEEDED
,
ERR_LIMIT_EXCEEDED
,
...
...
sql/sql_plugin.cc
View file @
df52ae2a
...
@@ -23,9 +23,9 @@ char *opt_plugin_dir_ptr;
...
@@ -23,9 +23,9 @@ char *opt_plugin_dir_ptr;
char
opt_plugin_dir
[
FN_REFLEN
];
char
opt_plugin_dir
[
FN_REFLEN
];
LEX_STRING
plugin_type_names
[]
=
LEX_STRING
plugin_type_names
[]
=
{
{
{
STRING_WITH_LEN
(
"UDF"
)
},
{
(
char
*
)
STRING_WITH_LEN
(
"UDF"
)
},
{
STRING_WITH_LEN
(
"STORAGE ENGINE"
)
},
{
(
char
*
)
STRING_WITH_LEN
(
"STORAGE ENGINE"
)
},
{
STRING_WITH_LEN
(
"FTPARSER"
)
}
{
(
char
*
)
STRING_WITH_LEN
(
"FTPARSER"
)
}
};
};
static
const
char
*
plugin_interface_version_sym
=
static
const
char
*
plugin_interface_version_sym
=
"_mysql_plugin_interface_version_"
;
"_mysql_plugin_interface_version_"
;
...
...
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