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
dac2557a
Commit
dac2557a
authored
23 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work.mysql.com:/home/bk/mysql-4.0
into tik.mysql.fi:/home/my/mysql-4.0 Docs/manual.texi: Auto merged
parents
a56692c0
515f7cea
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
30 deletions
+19
-30
Docs/manual.texi
Docs/manual.texi
+2
-2
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+3
-3
sql/ha_innobase.cc
sql/ha_innobase.cc
+14
-25
No files found.
Docs/manual.texi
View file @
dac2557a
...
@@ -52760,8 +52760,8 @@ update statements if you want to narrow down the problem.
...
@@ -52760,8 +52760,8 @@ update statements if you want to narrow down the problem.
@cindex clients, debugging
@cindex clients, debugging
To be able to debug a MySQL client with the integrated debug package,
To be able to debug a MySQL client with the integrated debug package,
you should configure MySQL with @code{--with-debug}
.
you should configure MySQL with @code{--with-debug}
or
@xref{configure options}.
@
code{--with-debug=full}. @
xref{configure options}.
@tindex MYSQL_DEBUG environment variable
@tindex MYSQL_DEBUG environment variable
@tindex Environment variable, MYSQL_DEBUG
@tindex Environment variable, MYSQL_DEBUG
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.sh
View file @
dac2557a
...
@@ -210,9 +210,9 @@ while test $# -gt 0; do
...
@@ -210,9 +210,9 @@ while test $# -gt 0; do
;;
;;
--debug
)
--debug
)
EXTRA_MASTER_MYSQLD_OPT
=
"
$EXTRA_MASTER_MYSQLD_OPT
\
EXTRA_MASTER_MYSQLD_OPT
=
"
$EXTRA_MASTER_MYSQLD_OPT
\
--debug=d:t:O,
$MYSQL_T
MP_DIR
/master.trace"
--debug=d:t:O,
$MYSQL_T
EST_DIR
/var/log
/master.trace"
EXTRA_SLAVE_MYSQLD_OPT
=
"
$EXTRA_SLAVE_MYSQLD_OPT
\
EXTRA_SLAVE_MYSQLD_OPT
=
"
$EXTRA_SLAVE_MYSQLD_OPT
\
--debug=d:t:O,
$MYSQL_T
MP_DIR
/slave.trace"
--debug=d:t:O,
$MYSQL_T
EST_DIR
/var/log
/slave.trace"
EXTRA_MYSQL_TEST_OPT
=
"
$EXTRA_MYSQL_TEST_OPT
--debug"
EXTRA_MYSQL_TEST_OPT
=
"
$EXTRA_MYSQL_TEST_OPT
--debug"
;;
;;
--
)
shift
;
break
;;
--
)
shift
;
break
;;
...
@@ -589,7 +589,7 @@ start_slave()
...
@@ -589,7 +589,7 @@ start_slave()
then
then
$ECHO
"set args
$master_args
"
>
$GDB_SLAVE_INIT
$ECHO
"set args
$master_args
"
>
$GDB_SLAVE_INIT
ddd
--debugger
"gdb -x
$GDB_SLAVE_INIT
"
$SLAVE_MYSQLD
&
ddd
--debugger
"gdb -x
$GDB_SLAVE_INIT
"
$SLAVE_MYSQLD
&
prompt_user
"Hit enter to continue after you've started the
master
"
prompt_user
"Hit enter to continue after you've started the
slave
"
elif
[
x
$DO_GDB
=
x1
]
elif
[
x
$DO_GDB
=
x1
]
then
then
$ECHO
"set args
$slave_args
"
>
$GDB_SLAVE_INIT
$ECHO
"set args
$slave_args
"
>
$GDB_SLAVE_INIT
...
...
This diff is collapsed.
Click to expand it.
sql/ha_innobase.cc
View file @
dac2557a
...
@@ -93,6 +93,7 @@ bool innobase_flush_log_at_trx_commit, innobase_log_archive,
...
@@ -93,6 +93,7 @@ bool innobase_flush_log_at_trx_commit, innobase_log_archive,
*/
*/
char
*
innobase_data_file_path
=
(
char
*
)
"ibdata1:64M"
;
char
*
innobase_data_file_path
=
(
char
*
)
"ibdata1:64M"
;
char
*
internal_innobase_data_file_path
=
0
;
/* The following counter is used to convey information to InnoDB
/* The following counter is used to convey information to InnoDB
about server activity: in selects it is not sensible to call
about server activity: in selects it is not sensible to call
...
@@ -219,7 +220,7 @@ innobase_mysql_print_thd(
...
@@ -219,7 +220,7 @@ innobase_mysql_print_thd(
}
}
if
(
thd
->
query
)
{
if
(
thd
->
query
)
{
printf
(
" %
0
.100s"
,
thd
->
query
);
printf
(
" %
-
.100s"
,
thd
->
query
);
}
}
printf
(
"
\n
"
);
printf
(
"
\n
"
);
...
@@ -304,7 +305,7 @@ innobase_parse_data_file_paths_and_sizes(void)
...
@@ -304,7 +305,7 @@ innobase_parse_data_file_paths_and_sizes(void)
ulint
size
;
ulint
size
;
ulint
i
=
0
;
ulint
i
=
0
;
str
=
innobase_data_file_path
;
str
=
in
ternal_in
nobase_data_file_path
;
/* First calculate the number of data files and check syntax:
/* First calculate the number of data files and check syntax:
path:size[M];path:size[M]... . Note that a Windows path may
path:size[M];path:size[M]... . Note that a Windows path may
...
@@ -380,7 +381,7 @@ innobase_parse_data_file_paths_and_sizes(void)
...
@@ -380,7 +381,7 @@ innobase_parse_data_file_paths_and_sizes(void)
/* Then store the actual values to our arrays */
/* Then store the actual values to our arrays */
str
=
innobase_data_file_path
;
str
=
in
ternal_in
nobase_data_file_path
;
i
=
0
;
i
=
0
;
while
(
*
str
!=
'\0'
)
{
while
(
*
str
!=
'\0'
)
{
...
@@ -544,21 +545,9 @@ innobase_init(void)
...
@@ -544,21 +545,9 @@ innobase_init(void)
/* Set InnoDB initialization parameters according to the values
/* Set InnoDB initialization parameters according to the values
read from MySQL .cnf file */
read from MySQL .cnf file */
if
(
!
innobase_data_file_path
)
// Make a copy of innobase_data_file_path to not modify the original
{
internal_innobase_data_file_path
=
my_strdup
(
innobase_data_file_path
,
fprintf
(
stderr
,
MYF
(
MY_WME
));
"Cannot initialize InnoDB as 'innodb_data_file_path' is not set.
\n
"
"If you do not want to use transactional InnoDB tables, add a line
\n
"
"skip-innodb
\n
"
"to the [mysqld] section of init parameters in your my.cnf
\n
"
"or my.ini. If you want to use InnoDB tables, add for example,
\n
"
"innodb_data_file_path = /mysql/data/ibdata1:20M
\n
"
"More information on setting the parameters you find in the
\n
"
"manual.
\n
"
);
innodb_skip
=
1
;
DBUG_RETURN
(
FALSE
);
// Continue without innobase
}
srv_data_home
=
(
innobase_data_home_dir
?
innobase_data_home_dir
:
srv_data_home
=
(
innobase_data_home_dir
?
innobase_data_home_dir
:
current_dir
);
current_dir
);
...
@@ -833,7 +822,7 @@ normalize_table_name(
...
@@ -833,7 +822,7 @@ normalize_table_name(
}
}
/*********************************************************************
/*********************************************************************
Creates and opens a handle to a table which already exists in an Inn
n
obase
Creates and opens a handle to a table which already exists in an Innobase
database. */
database. */
int
int
...
@@ -2704,7 +2693,7 @@ ha_innobase::records_in_range(
...
@@ -2704,7 +2693,7 @@ ha_innobase::records_in_range(
DBUG_ENTER
(
"records_in_range"
);
DBUG_ENTER
(
"records_in_range"
);
if
(
prebuilt
->
trx
)
{
if
(
prebuilt
->
trx
)
{
prebuilt
->
trx
->
op_info
=
"estimating range size"
;
prebuilt
->
trx
->
op_info
=
(
char
*
)
"estimating range size"
;
}
}
active_index
=
keynr
;
active_index
=
keynr
;
...
@@ -2740,7 +2729,7 @@ ha_innobase::records_in_range(
...
@@ -2740,7 +2729,7 @@ ha_innobase::records_in_range(
my_free
((
char
*
)
key_val_buff2
,
MYF
(
0
));
my_free
((
char
*
)
key_val_buff2
,
MYF
(
0
));
if
(
prebuilt
->
trx
)
{
if
(
prebuilt
->
trx
)
{
prebuilt
->
trx
->
op_info
=
""
;
prebuilt
->
trx
->
op_info
=
(
char
*
)
""
;
}
}
DBUG_RETURN
((
ha_rows
)
n_rows
);
DBUG_RETURN
((
ha_rows
)
n_rows
);
...
@@ -2764,7 +2753,7 @@ ha_innobase::estimate_number_of_rows(void)
...
@@ -2764,7 +2753,7 @@ ha_innobase::estimate_number_of_rows(void)
if
(
prebuilt
->
trx
)
{
if
(
prebuilt
->
trx
)
{
prebuilt
->
trx
->
op_info
=
prebuilt
->
trx
->
op_info
=
"estimating upper bound of table size"
;
(
char
*
)
"estimating upper bound of table size"
;
}
}
DBUG_ENTER
(
"info"
);
DBUG_ENTER
(
"info"
);
...
@@ -2780,7 +2769,7 @@ ha_innobase::estimate_number_of_rows(void)
...
@@ -2780,7 +2769,7 @@ ha_innobase::estimate_number_of_rows(void)
/* The minimum clustered index record size is 20 bytes */
/* The minimum clustered index record size is 20 bytes */
if
(
prebuilt
->
trx
)
{
if
(
prebuilt
->
trx
)
{
prebuilt
->
trx
->
op_info
=
""
;
prebuilt
->
trx
->
op_info
=
(
char
*
)
""
;
}
}
return
((
ha_rows
)
(
1000
+
data_file_length
/
20
));
return
((
ha_rows
)
(
1000
+
data_file_length
/
20
));
...
@@ -2822,7 +2811,7 @@ ha_innobase::info(
...
@@ -2822,7 +2811,7 @@ ha_innobase::info(
DBUG_ENTER
(
"info"
);
DBUG_ENTER
(
"info"
);
if
(
prebuilt
->
trx
)
{
if
(
prebuilt
->
trx
)
{
prebuilt
->
trx
->
op_info
=
"calculating table stats"
;
prebuilt
->
trx
->
op_info
=
(
char
*
)
"calculating table stats"
;
}
}
ib_table
=
prebuilt
->
table
;
ib_table
=
prebuilt
->
table
;
...
@@ -2888,7 +2877,7 @@ ha_innobase::info(
...
@@ -2888,7 +2877,7 @@ ha_innobase::info(
}
}
if
(
prebuilt
->
trx
)
{
if
(
prebuilt
->
trx
)
{
prebuilt
->
trx
->
op_info
=
""
;
prebuilt
->
trx
->
op_info
=
(
char
*
)
""
;
}
}
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
...
...
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