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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
3c2ac1fc
Commit
3c2ac1fc
authored
Jan 29, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
parents
84536761
70dfda88
Changes
21
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
84 additions
and
61 deletions
+84
-61
.bzrignore
.bzrignore
+3
-0
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
Docs/Images/Makefile.am
Docs/Images/Makefile.am
+0
-4
client/Makefile.am
client/Makefile.am
+1
-1
client/mysqldump.c
client/mysqldump.c
+40
-3
configure.in
configure.in
+2
-2
dbug/Makefile.am
dbug/Makefile.am
+1
-3
extra/Makefile.am
extra/Makefile.am
+15
-14
include/Makefile.am
include/Makefile.am
+2
-7
libmysql/Makefile.am
libmysql/Makefile.am
+1
-1
libmysql_r/Makefile.am
libmysql_r/Makefile.am
+1
-1
libmysqld/Makefile.am
libmysqld/Makefile.am
+1
-1
libmysqld/examples/Makefile.am
libmysqld/examples/Makefile.am
+6
-9
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+1
-1
ndb/docs/Makefile.am
ndb/docs/Makefile.am
+1
-1
ndb/include/ndbapi/ndb_opt_defaults.h
ndb/include/ndbapi/ndb_opt_defaults.h
+0
-4
scripts/Makefile.am
scripts/Makefile.am
+1
-1
server-tools/instance-manager/Makefile.am
server-tools/instance-manager/Makefile.am
+1
-1
sql/Makefile.am
sql/Makefile.am
+2
-4
sql/share/Makefile.am
sql/share/Makefile.am
+3
-2
tools/Makefile.am
tools/Makefile.am
+1
-1
No files found.
.bzrignore
View file @
3c2ac1fc
...
...
@@ -1052,3 +1052,6 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
include/mysqld_ername.h
include/mysqld_error.h
include/sql_state.h
BitKeeper/etc/logging_ok
View file @
3c2ac1fc
...
...
@@ -241,6 +241,7 @@ tonu@x153.internalnet
tonu@x3.internalnet
tsmith@build.mysql.com
tulin@build.mysql.com
tulin@mysql.com
ulli@morbus.(none)
venu@hundin.mysql.fi
venu@myvenu.com
...
...
Docs/Images/Makefile.am
View file @
3c2ac1fc
...
...
@@ -27,9 +27,5 @@ EXTRA_DIST =
all
:
:
# Nothing to cleanup in this dummy directory.
clean
:
:
# Don't update the files from bitkeeper
%
::
SCCS/s.%
client/Makefile.am
View file @
3c2ac1fc
...
...
@@ -18,7 +18,7 @@
#AUTOMAKE_OPTIONS = nostdinc
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_srcdir)
/regex
\
$(openssl_includes)
-I
$(top_
srcdir)
/extra
$(openssl_includes)
-I
$(top_
builddir)
/include
LIBS
=
@CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@
\
$(top_builddir)
/libmysql/libmysqlclient.la
...
...
client/mysqldump.c
View file @
3c2ac1fc
...
...
@@ -2186,6 +2186,38 @@ static my_bool dump_all_views_in_db(char *database)
return
0
;
}
/* dump_all_tables_in_db */
/*
get_actual_table_name -- executes a SHOW TABLES LIKE '%s' to get the actual
table name from the server for the table name given on the command line.
we do this because the table name given on the command line may be a
different case (e.g. T1 vs t1)
RETURN
void
*/
static
void
get_actual_table_name
(
const
char
*
old_table_name
,
char
*
new_table_name
,
int
buf_size
)
{
MYSQL_RES
*
tableRes
;
MYSQL_ROW
row
;
char
query
[
NAME_LEN
+
50
];
DBUG_ENTER
(
"get_actual_table_name"
);
sprintf
(
query
,
"SHOW TABLES LIKE '%s'"
,
old_table_name
);
if
(
mysql_query_with_error_report
(
sock
,
0
,
query
))
{
safe_exit
(
EX_MYSQLERR
);
}
tableRes
=
mysql_store_result
(
sock
);
row
=
mysql_fetch_row
(
tableRes
);
strncpy
(
new_table_name
,
row
[
0
],
buf_size
);
mysql_free_result
(
tableRes
);
}
/* get_actual_table_name */
static
int
dump_selected_tables
(
char
*
db
,
char
**
table_names
,
int
tables
)
{
uint
numrows
;
...
...
@@ -2219,9 +2251,14 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
print_xml_tag1
(
md_result_file
,
""
,
"database name="
,
db
,
"
\n
"
);
for
(
i
=
0
;
i
<
tables
;
i
++
)
{
numrows
=
getTableStructure
(
table_names
[
i
],
db
);
if
(
!
dFlag
&&
numrows
>
0
)
dumpTable
(
numrows
,
table_names
[
i
]);
char
new_table_name
[
NAME_LEN
];
/* the table name passed on commandline may be wrong case */
get_actual_table_name
(
table_names
[
i
],
new_table_name
,
sizeof
(
new_table_name
)
);
numrows
=
getTableStructure
(
new_table_name
,
db
);
dumpTable
(
numrows
,
new_table_name
);
my_free
(
order_by
,
MYF
(
MY_ALLOW_ZERO_PTR
));
order_by
=
0
;
}
...
...
configure.in
View file @
3c2ac1fc
...
...
@@ -1674,8 +1674,8 @@ then
elif test "
$with_debug
" = "
full
"
then
# Full debug. Very slow in some cases
CFLAGS="
$DEBUG_CFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
-DUNIV_DEBUG
$CFLAGS
"
CXXFLAGS="
$DEBUG_CXXFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
-DUNIV_DEBUG
$CXXFLAGS
"
CFLAGS="
$DEBUG_CFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
$CFLAGS
"
CXXFLAGS="
$DEBUG_CXXFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
$CXXFLAGS
"
else
# Optimized version. No debug
CFLAGS="
$OPTIMIZE_CFLAGS
-DDBUG_OFF
$CFLAGS
"
...
...
dbug/Makefile.am
View file @
3c2ac1fc
...
...
@@ -26,6 +26,7 @@ EXTRA_DIST = example1.c example2.c example3.c \
NROFF_INC
=
example1.r example2.r example3.r main.r
\
factorial.r output1.r output2.r output3.r
\
output4.r output5.r
CLEANFILES
=
$(NROFF_INC)
user.t user.ps
# Must be linked with libs that are not compiled yet
...
...
@@ -59,8 +60,5 @@ output5.r: factorial
@
RM@
-f
$@
@
SED@
-e
's!\\!\\\\!g'
$<
>
$@
clean
:
@
RM@
-f
$(NROFF_INC)
user.t user.ps
# Don't update the files from bitkeeper
%
::
SCCS/s.%
extra/Makefile.am
View file @
3c2ac1fc
...
...
@@ -16,25 +16,26 @@
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
\
@ndbcluster_includes@
-I
$(top_srcdir)
/sql
\
-I
$(top_
srcdir)
/extra
-I
$(top_
builddir)
/include
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a
\
../dbug/libdbug.a ../strings/libmystrings.a
BUILT_SOURCES
=
mysqld_error.h sql_state.h mysqld_ername.h
BUILT_SOURCES
=
$(top_builddir)
/include/mysqld_error.h
\
$(top_builddir)
/include/sql_state.h
\
$(top_builddir)
/include/mysqld_ername.h
pkginclude_HEADERS
=
$(BUILT_SOURCES)
created_sources
=
created_include_files
CLEANFILES
=
$(created_sources)
SUPERCLEANFILES
=
$(BUILT_SOURCES)
all
:
$(created_sources)
CLEANFILES
=
$(BUILT_SOURCES)
# This will build mysqld_error.h and sql_state.h
mysqld_error.h
:
created_include_files
mysqld_ername.h
:
created_include_files
sql_state.h
:
created_include_files
created_include_files
:
comp_err
$(top_builddir)
/extra/comp_err
--charset
=
$(srcdir)
/../sql/share/charsets
--out-dir
=
$(top_builddir)
/sql/share/
--header_file
=
$(top_builddir)
/extra/mysqld_error.h
--name_file
=
$(top_builddir)
/extra/mysqld_ername.h
--state_file
=
$(top_builddir)
/extra/sql_state.h
--in_file
=
$(srcdir)
/../sql/share/errmsg.txt
touch
created_include_files
$(top_builddir)/include/mysqld_error.h
:
comp_err
$(top_builddir)
/extra/comp_err
\
--charset
=
$(top_srcdir)
/sql/share/charsets
\
--out-dir
=
$(top_builddir)
/sql/share/
\
--header_file
=
$(top_builddir)
/include/mysqld_error.h
\
--name_file
=
$(top_builddir)
/include/mysqld_ername.h
\
--state_file
=
$(top_builddir)
/include/sql_state.h
\
--in_file
=
$(top_srcdir)
/sql/share/errmsg.txt
$(top_builddir)/include/mysqld_ername.h
:
$(top_builddir)/include/mysqld_error.h
$(top_builddir)/include/sql_state.h
:
$(top_builddir)/include/mysqld_error.h
bin_PROGRAMS
=
replace comp_err perror resolveip my_print_defaults
\
resolve_stack_dump mysql_waitpid
...
...
include/Makefile.am
View file @
3c2ac1fc
...
...
@@ -33,15 +33,10 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
mysql_version.h.in my_handler.h my_time.h decimal.h
# mysql_version.h are generated
SUPERCLEANFILES
=
mysql_version.h my_config.h
CLEANFILES
=
mysql_version.h my_config.h readline
# Some include files that may be moved and patched by configure
DISTCLEANFILES
=
sched.h
$(SUPERCLEANFILES)
clean
:
$(RM)
-fr
readline
distclean
:
$(RM)
-fr
readline
DISTCLEANFILES
=
sched.h
$(CLEANFILES)
all-local
:
my_config.h
...
...
libmysql/Makefile.am
View file @
3c2ac1fc
...
...
@@ -24,7 +24,7 @@ target = libmysqlclient.la
target_defs
=
-DUNDEF_THREADS_HACK
-DDONT_USE_RAID
@LIB_EXTRA_CCFLAGS@
LIBS
=
@CLIENT_LIBS@
INCLUDES
=
-I
$(top_srcdir)
/include
$(openssl_includes)
@ZLIB_INCLUDES@
\
-I
$(top_
srcdir)
/extra
-I
$(top_
builddir)
/include
include
$(srcdir)/Makefile.shared
...
...
libmysql_r/Makefile.am
View file @
3c2ac1fc
...
...
@@ -26,7 +26,7 @@ LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
INCLUDES
=
@MT_INCLUDES@
\
-I
$(top_srcdir)
/include
$(openssl_includes)
@ZLIB_INCLUDES@
\
-I
$(top_
srcdir)
/extra
-I
$(top_
builddir)
/include
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include
$(top_srcdir)/libmysql/Makefile.shared
...
...
libmysqld/Makefile.am
View file @
3c2ac1fc
...
...
@@ -28,7 +28,7 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
INCLUDES
=
@MT_INCLUDES@ @bdb_includes@
-I
$(top_srcdir)
/include
\
-I
$(top_srcdir)
/sql
-I
$(top_srcdir)
/sql/examples
\
-I
$(top_srcdir)
/regex
\
-I
$(top_
srcdir)
/extra
\
-I
$(top_
builddir)
/include
\
$(openssl_includes)
@ZLIB_INCLUDES@
noinst_LIBRARIES
=
libmysqld_int.a
...
...
libmysqld/examples/Makefile.am
View file @
3c2ac1fc
noinst_PROGRAMS
=
mysql
bin_PROGRAMS
=
mysqltest_embedded mysql_client_test_embedded
client_sources
=
$(mysqltest_embedded_SOURCES)
$(mysql_SOURCES)
tests_sources
=
$(mysql_client_test_embedded_SOURCES)
tests_sources
=
$(mysql_client_test_embedded_SOURCES)
CLEANFILES
=
$(client_sources)
$(tests_sources)
link_sources
:
for
f
in
$(client_sources)
;
do
\
...
...
@@ -16,7 +17,7 @@ link_sources:
DEFS
=
-DEMBEDDED_LIBRARY
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
-I
$(srcdir)
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/client
-I
$(top_srcdir)
/regex
\
-I
$(top_
srcdir)
/extra
$(openssl_includes)
-I
$(top_
builddir)
/include
$(openssl_includes)
LIBS
=
@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@
$(CXXLDFLAGS)
...
...
@@ -31,9 +32,5 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
mysql_client_test_embedded_LINK
=
$(CXXLINK)
mysql_client_test_embedded_SOURCES
=
mysql_client_test.c
clean
:
rm
-f
$(client_sources)
rm
-f
$(tests_sources)
# Don't update the files from bitkeeper
%
::
SCCS/s.%
mysql-test/mysql-test-run.sh
View file @
3c2ac1fc
...
...
@@ -1429,7 +1429,7 @@ run_testcase ()
if
[
-n
"
$RESULT_EXT
"
-a
\(
x
$RECORD
=
x1
-o
-f
"
$result_file$RESULT_EXT
"
\)
]
;
then
result_file
=
"
$result_file$RESULT_EXT
"
fi
if
[
-
e
"
$TESTDIR
/
$tname
.disabled"
]
if
[
-
f
"
$TESTDIR
/
$tname
.disabled"
]
then
comment
=
`
$CAT
$TESTDIR
/
$tname
.disabled
`
;
disable_test
$tname
"
$comment
"
...
...
ndb/docs/Makefile.am
View file @
3c2ac1fc
...
...
@@ -9,7 +9,7 @@ DOXYOUT = .doxyout
NDB_RELEASE
=
@NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@
clean
:
clean
-local
:
rm
-rf
ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
rm
-rf
$(DOXYTMP)
$(DOXYOUT)
...
...
ndb/include/ndbapi/ndb_opt_defaults.h
View file @
3c2ac1fc
...
...
@@ -17,11 +17,7 @@
#ifndef NDB_OPT_DEFAULTS_H
#define NDB_OPT_DEFAULTS_H
#ifdef SIGRTMIN
#define OPT_NDB_SHM_SIGNUM_DEFAULT SIGRTMIN+2
#else
#define OPT_NDB_SHM_SIGNUM_DEFAULT 0
#endif
#define OPT_NDB_SHM_DEFAULT 0
#endif
scripts/Makefile.am
View file @
3c2ac1fc
...
...
@@ -90,7 +90,7 @@ CLEANFILES = @server_scripts@ \
fill_help_tables
\
mysql_create_system_tables
SUPERCLEANFILES
=
mysqlbug
DISTCLEANFILES
=
mysqlbug
# We want the right version and configure comand line in mysqlbug
mysqlbug
:
${top_builddir}/config.status mysqlbug.sh
...
...
server-tools/instance-manager/Makefile.am
View file @
3c2ac1fc
...
...
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_
srcdir)
/extra
INCLUDES
=
-I
$(top_srcdir)
/include
-I
$(top_
builddir)
/include
DEFS
=
-DMYSQL_INSTANCE_MANAGER
-DMYSQL_SERVER
...
...
sql/Makefile.am
View file @
3c2ac1fc
...
...
@@ -22,7 +22,7 @@ MYSQLBASEdir= $(prefix)
INCLUDES
=
@MT_INCLUDES@ @ZLIB_INCLUDES@
\
@bdb_includes@ @innodb_includes@ @ndbcluster_includes@
\
-I
$(top_srcdir)
/include
-I
$(top_srcdir)
/regex
\
-I
$(srcdir)
$(openssl_includes)
-I
$(top_
srcdir)
/extra
-I
$(srcdir)
$(openssl_includes)
-I
$(top_
builddir)
/include
WRAPLIBS
=
@WRAPLIBS@
SUBDIRS
=
share
libexec_PROGRAMS
=
mysqld
...
...
@@ -115,6 +115,7 @@ DEFS = -DMYSQL_SERVER \
# Don't put lex_hash.h in BUILT_SOURCES as this will give infinite recursion
BUILT_SOURCES
=
sql_yacc.cc sql_yacc.h
EXTRA_DIST
=
udf_example.cc
$(BUILT_SOURCES)
DISTCLEANFILES
=
lex_hash.h
AM_YFLAGS
=
-d
mysql_tzinfo_to_sql.cc
:
...
...
@@ -160,8 +161,5 @@ sql_lex.o: lex_hash.h
udf_example.so
:
udf_example.cc
$(CXXCOMPILE)
-shared
-o
$@
$<
distclean
:
rm
-f
lex_hash.h
# Don't update the files from bitkeeper
%
::
SCCS/s.%
sql/share/Makefile.am
View file @
3c2ac1fc
...
...
@@ -14,10 +14,11 @@ dist-hook:
all
:
english/errmsg.sys
# Use the english errmsg.sys as a flag that all errmsg.sys needs to be
# created. Normally these are created by extra/Makefile
.am
# created. Normally these are created by extra/Makefile
english/errmsg.sys
:
errmsg.txt
$(top_builddir)
/extra/comp_err
--charset
=
$(srcdir)
/charsets
--out-dir
=
$(top_builddir)
/sql/share/
--header_file
=
$(top_builddir)
/extra/mysqld_error.h
--state_file
=
$(top_builddir)
/extra/sql_state.h
--in_file
=
errmsg.txt
rm
$(top_builddir)
/include/mysqld_error.h
(
cd
$(top_builddir)
/extra
&&
$(MAKE)
)
install-data-local
:
for
lang
in
@AVAILABLE_LANGUAGES@
;
\
...
...
tools/Makefile.am
View file @
3c2ac1fc
...
...
@@ -16,7 +16,7 @@
# Process this file with automake to create Makefile.in
INCLUDES
=
@MT_INCLUDES@
-I
$(top_srcdir)
/include
$(openssl_includes)
\
-I
$(top_
srcdir)
/extra
-I
$(top_
builddir)
/include
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ @openssl_libs@
\
$(top_builddir)
/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@
bin_PROGRAMS
=
mysqlmanager
...
...
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