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
30a51b53
Commit
30a51b53
authored
Aug 08, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
parents
245b4beb
987edeaa
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
14 additions
and
6 deletions
+14
-6
client/mysqldump.c
client/mysqldump.c
+1
-1
client/mysqltest.c
client/mysqltest.c
+1
-0
myisam/ft_boolean_search.c
myisam/ft_boolean_search.c
+1
-0
myisammrg/myrg_static.c
myisammrg/myrg_static.c
+1
-1
mysql-test/r/rpl_drop_temp.result
mysql-test/r/rpl_drop_temp.result
+1
-0
mysql-test/t/rpl_drop_temp.test
mysql-test/t/rpl_drop_temp.test
+2
-0
ndb/src/common/logger/LogHandler.cpp
ndb/src/common/logger/LogHandler.cpp
+1
-1
sql/field.cc
sql/field.cc
+1
-1
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+1
-0
sql/sql_base.cc
sql/sql_base.cc
+1
-0
tests/mysql_client_test.c
tests/mysql_client_test.c
+3
-2
No files found.
client/mysqldump.c
View file @
30a51b53
...
@@ -2370,7 +2370,7 @@ static int do_show_master_status(MYSQL *mysql_con)
...
@@ -2370,7 +2370,7 @@ static int do_show_master_status(MYSQL *mysql_con)
{
{
/* SHOW MASTER STATUS reports nothing and --force is not enabled */
/* SHOW MASTER STATUS reports nothing and --force is not enabled */
my_printf_error
(
0
,
"Error: Binlogging on server not active"
,
my_printf_error
(
0
,
"Error: Binlogging on server not active"
,
MYF
(
0
)
,
mysql_error
(
mysql_con
)
);
MYF
(
0
));
mysql_free_result
(
master
);
mysql_free_result
(
master
);
return
1
;
return
1
;
}
}
...
...
client/mysqltest.c
View file @
30a51b53
...
@@ -2654,6 +2654,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
...
@@ -2654,6 +2654,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
if
(
!
disable_result_log
)
if
(
!
disable_result_log
)
{
{
ulong
affected_rows
;
/* Ok to be undef if 'disable_info' is set */
ulong
affected_rows
;
/* Ok to be undef if 'disable_info' is set */
LINT_INIT
(
affected_rows
);
if
(
res
)
if
(
res
)
{
{
...
...
myisam/ft_boolean_search.c
View file @
30a51b53
...
@@ -210,6 +210,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
...
@@ -210,6 +210,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
MI_INFO
*
info
=
ftb
->
info
;
MI_INFO
*
info
=
ftb
->
info
;
uint
off
,
extra
=
HA_FT_WLEN
+
info
->
s
->
base
.
rec_reflength
;
uint
off
,
extra
=
HA_FT_WLEN
+
info
->
s
->
base
.
rec_reflength
;
byte
*
lastkey_buf
=
ftbw
->
word
+
ftbw
->
off
;
byte
*
lastkey_buf
=
ftbw
->
word
+
ftbw
->
off
;
LINT_INIT
(
off
);
if
(
ftbw
->
flags
&
FTB_FLAG_TRUNC
)
if
(
ftbw
->
flags
&
FTB_FLAG_TRUNC
)
lastkey_buf
+=
ftbw
->
len
;
lastkey_buf
+=
ftbw
->
len
;
...
...
myisammrg/myrg_static.c
View file @
30a51b53
...
@@ -27,4 +27,4 @@ LIST *myrg_open_list=0;
...
@@ -27,4 +27,4 @@ LIST *myrg_open_list=0;
static
const
char
*
merge_insert_methods
[]
=
static
const
char
*
merge_insert_methods
[]
=
{
"FIRST"
,
"LAST"
,
NullS
};
{
"FIRST"
,
"LAST"
,
NullS
};
TYPELIB
merge_insert_method
=
{
array_elements
(
merge_insert_methods
)
-
1
,
""
,
TYPELIB
merge_insert_method
=
{
array_elements
(
merge_insert_methods
)
-
1
,
""
,
merge_insert_methods
};
merge_insert_methods
,
0
};
mysql-test/r/rpl_drop_temp.result
View file @
30a51b53
...
@@ -10,3 +10,4 @@ create temporary table mysqltest.t2 (n int);
...
@@ -10,3 +10,4 @@ create temporary table mysqltest.t2 (n int);
show status like 'Slave_open_temp_tables';
show status like 'Slave_open_temp_tables';
Variable_name Value
Variable_name Value
Slave_open_temp_tables 0
Slave_open_temp_tables 0
drop database mysqltest;
mysql-test/t/rpl_drop_temp.test
View file @
30a51b53
...
@@ -11,5 +11,7 @@ disconnect master;
...
@@ -11,5 +11,7 @@ disconnect master;
connection
slave
;
connection
slave
;
--
real_sleep
3
;
# time for DROP to be written
--
real_sleep
3
;
# time for DROP to be written
show
status
like
'Slave_open_temp_tables'
;
show
status
like
'Slave_open_temp_tables'
;
connection
default
;
drop
database
mysqltest
;
# End of 4.1 tests
# End of 4.1 tests
ndb/src/common/logger/LogHandler.cpp
View file @
30a51b53
...
@@ -58,7 +58,7 @@ LogHandler::append(const char* pCategory, Logger::LoggerLevel level,
...
@@ -58,7 +58,7 @@ LogHandler::append(const char* pCategory, Logger::LoggerLevel level,
}
}
else
// repeated message
else
// repeated message
{
{
if
(
now
<
m_last_log_time
+
m_max_repeat_frequency
)
if
(
now
<
(
time_t
)
(
m_last_log_time
+
m_max_repeat_frequency
)
)
{
{
m_count_repeated_messages
++
;
m_count_repeated_messages
++
;
m_now
=
now
;
m_now
=
now
;
...
...
sql/field.cc
View file @
30a51b53
...
@@ -5003,7 +5003,7 @@ int Field_str::store(double nr)
...
@@ -5003,7 +5003,7 @@ int Field_str::store(double nr)
double
anr
=
fabs
(
nr
);
double
anr
=
fabs
(
nr
);
int
neg
=
(
nr
<
0.0
)
?
1
:
0
;
int
neg
=
(
nr
<
0.0
)
?
1
:
0
;
if
(
char_length
>
4
&&
char_length
<
32
&&
if
(
char_length
>
4
&&
char_length
<
32
&&
(
anr
<
1.0
?
anr
>
1
/
(
log_10
[
max
(
0
,
char_length
-
neg
-
2
)])
/* -2 for "0." */
(
anr
<
1.0
?
anr
>
1
/
(
log_10
[
max
(
0
,
(
int
)
char_length
-
neg
-
2
)])
/* -2 for "0." */
:
anr
<
log_10
[
char_length
-
neg
]
-
1
))
:
anr
<
log_10
[
char_length
-
neg
]
-
1
))
use_scientific_notation
=
FALSE
;
use_scientific_notation
=
FALSE
;
...
...
sql/ha_ndbcluster.cc
View file @
30a51b53
...
@@ -2413,6 +2413,7 @@ void ha_ndbcluster::print_results()
...
@@ -2413,6 +2413,7 @@ void ha_ndbcluster::print_results()
break
;
break
;
}
}
case
NdbDictionary
:
:
Column
::
Undefined
:
case
NdbDictionary
:
:
Column
::
Undefined
:
default:
fprintf
(
DBUG_FILE
,
"Unknown type: %d"
,
col
->
getType
());
fprintf
(
DBUG_FILE
,
"Unknown type: %d"
,
col
->
getType
());
break
;
break
;
}
}
...
...
sql/sql_base.cc
View file @
30a51b53
...
@@ -2186,6 +2186,7 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter,
...
@@ -2186,6 +2186,7 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter,
bool
found_unaliased_non_uniq
=
0
;
bool
found_unaliased_non_uniq
=
0
;
uint
unaliased_counter
;
uint
unaliased_counter
;
LINT_INIT
(
unaliased_counter
);
*
unaliased
=
FALSE
;
*
unaliased
=
FALSE
;
if
(
find
->
type
()
==
Item
::
FIELD_ITEM
||
find
->
type
()
==
Item
::
REF_ITEM
)
if
(
find
->
type
()
==
Item
::
FIELD_ITEM
||
find
->
type
()
==
Item
::
REF_ITEM
)
...
...
tests/mysql_client_test.c
View file @
30a51b53
...
@@ -6805,6 +6805,7 @@ static void test_set_option()
...
@@ -6805,6 +6805,7 @@ static void test_set_option()
bug #89 (reported by mark@mysql.com)
bug #89 (reported by mark@mysql.com)
*/
*/
#ifndef EMBEDDED_LIBRARY
static
void
test_prepare_grant
()
static
void
test_prepare_grant
()
{
{
int
rc
;
int
rc
;
...
@@ -6896,7 +6897,7 @@ static void test_prepare_grant()
...
@@ -6896,7 +6897,7 @@ static void test_prepare_grant()
}
}
}
}
#endif
/* EMBEDDED_LIBRARY */
/*
/*
Test a crash when invalid/corrupted .frm is used in the
Test a crash when invalid/corrupted .frm is used in the
...
@@ -11566,7 +11567,7 @@ static void test_bug8330()
...
@@ -11566,7 +11567,7 @@ static void test_bug8330()
const
char
*
stmt_text
;
const
char
*
stmt_text
;
MYSQL_STMT
*
stmt
[
2
];
MYSQL_STMT
*
stmt
[
2
];
int
i
,
rc
;
int
i
,
rc
;
char
*
query
=
"select a,b from t1 where a=?"
;
c
onst
c
har
*
query
=
"select a,b from t1 where a=?"
;
MYSQL_BIND
bind
[
2
];
MYSQL_BIND
bind
[
2
];
long
lval
[
2
];
long
lval
[
2
];
...
...
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