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
f25b4e04
Commit
f25b4e04
authored
Jun 30, 2006
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
d126ca80
c887b91d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
21 deletions
+20
-21
heap/hp_test1.c
heap/hp_test1.c
+2
-1
heap/hp_test2.c
heap/hp_test2.c
+1
-0
include/my_global.h
include/my_global.h
+2
-2
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+7
-13
mysql-test/t/mysqldump.test
mysql-test/t/mysqldump.test
+1
-1
mysys/my_handler.c
mysys/my_handler.c
+1
-0
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+4
-2
strings/strtod.c
strings/strtod.c
+2
-2
No files found.
heap/hp_test1.c
View file @
f25b4e04
...
...
@@ -44,6 +44,7 @@ int main(int argc, char **argv)
get_options
(
argc
,
argv
);
bzero
(
&
hp_create_info
,
sizeof
(
hp_create_info
));
hp_create_info
.
max_table_size
=
1024L
*
1024L
;
keyinfo
[
0
].
keysegs
=
1
;
keyinfo
[
0
].
seg
=
keyseg
;
...
...
@@ -58,7 +59,7 @@ int main(int argc, char **argv)
bzero
((
gptr
)
flags
,
sizeof
(
flags
));
printf
(
"- Creating heap-file
\n
"
);
if
(
heap_create
(
filename
,
1
,
keyinfo
,
30
,(
ulong
)
flag
*
100000
l
,
10l
,
if
(
heap_create
(
filename
,
1
,
keyinfo
,
30
,(
ulong
)
flag
*
100000
L
,
10L
,
&
hp_create_info
)
||
!
(
file
=
heap_open
(
filename
,
2
)))
goto
err
;
...
...
heap/hp_test2.c
View file @
f25b4e04
...
...
@@ -74,6 +74,7 @@ int main(int argc, char *argv[])
get_options
(
argc
,
argv
);
bzero
(
&
hp_create_info
,
sizeof
(
hp_create_info
));
hp_create_info
.
max_table_size
=
1024L
*
1024L
;
write_count
=
update
=
opt_delete
=
0
;
key_check
=
0
;
...
...
include/my_global.h
View file @
f25b4e04
...
...
@@ -976,8 +976,8 @@ do { doubleget_union _tmp; \
#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
*(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \
} while (0)
#define float4get(V,M)
do { *((long *) &(V)) = *((long
*) (M)); } while(0)
#define float8get(V,M) doubleget((V),(M))
#define float4get(V,M)
do { *((float *) &(V)) = *((float
*) (M)); } while(0)
#define float8get(V,M)
doubleget((V),(M))
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V),sizeof(float))
#define floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))
...
...
mysql-test/mysql-test-run.sh
View file @
f25b4e04
...
...
@@ -1252,16 +1252,16 @@ start_master()
if
[
x
$DO_DDD
=
x1
]
then
$ECHO
"set args
$master_args
"
>
$GDB_MASTER_INIT
$ECHO
"set args
$master_args
"
>
$GDB_MASTER_INIT
$1
manager_launch master ddd
-display
$DISPLAY
--debugger
\
"gdb -x
$GDB_MASTER_INIT
"
$MASTER_MYSQLD
"gdb -x
$GDB_MASTER_INIT
$1
"
$MASTER_MYSQLD
elif
[
x
$DO_GDB
=
x1
]
then
if
[
x
$MANUAL_GDB
=
x1
]
then
$ECHO
"set args
$master_args
"
>
$GDB_MASTER_INIT
$ECHO
"set args
$master_args
"
>
$GDB_MASTER_INIT
$1
$ECHO
"To start gdb for the master , type in another window:"
$ECHO
"cd
$CWD
; gdb -x
$GDB_MASTER_INIT
$MASTER_MYSQLD
"
$ECHO
"cd
$CWD
; gdb -x
$GDB_MASTER_INIT
$1
$MASTER_MYSQLD
"
wait_for_master
=
1500
else
(
$ECHO
set
args
$master_args
;
...
...
@@ -1273,9 +1273,9 @@ disa 1
end
r
EOF
fi
)
>
$GDB_MASTER_INIT
fi
)
>
$GDB_MASTER_INIT
$1
manager_launch master
$XTERM
-display
$DISPLAY
\
-title
"Master"
-e
gdb
-x
$GDB_MASTER_INIT
$MASTER_MYSQLD
-title
"Master"
-e
gdb
-x
$GDB_MASTER_INIT
$1
$MASTER_MYSQLD
fi
else
manager_launch master
$MASTER_MYSQLD
$master_args
...
...
@@ -1810,13 +1810,7 @@ then
mysql_install_db
start_manager
# Do not automagically start daemons if we are in gdb or running only one test
# case
if
[
-z
"
$DO_GDB
"
]
&&
[
-z
"
$DO_DDD
"
]
then
mysql_start
fi
mysql_start
$ECHO
"Loading Standard Test Databases"
mysql_loadstd
fi
...
...
mysql-test/t/mysqldump.test
View file @
f25b4e04
...
...
@@ -652,7 +652,7 @@ drop table t1;
# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
#
--
exec
$MYSQL_MY_PRINT_DEFAULTS
--
defaults
-
extra
-
file
=
$MYSQL_TEST_DIR
/
std_data
/
bug15328
.
cnf
mysqldump
--
exec
$MYSQL_MY_PRINT_DEFAULTS
--
defaults
-
file
=
$MYSQL_TEST_DIR
/
std_data
/
bug15328
.
cnf
mysqldump
# BUG #19025 mysqldump doesn't correctly dump "auto_increment = [int]"
...
...
mysys/my_handler.c
View file @
f25b4e04
...
...
@@ -15,6 +15,7 @@
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA */
#include <my_global.h>
#include "my_handler.h"
int
mi_compare_text
(
CHARSET_INFO
*
charset_info
,
uchar
*
a
,
uint
a_length
,
...
...
sql/ha_ndbcluster.cc
View file @
f25b4e04
...
...
@@ -2300,12 +2300,14 @@ void ha_ndbcluster::unpack_record(byte* buf)
{
// Table with hidden primary key
int
hidden_no
=
table
->
fields
;
char
buff
[
22
];
const
NDBTAB
*
tab
=
(
const
NDBTAB
*
)
m_table
;
const
NDBCOL
*
hidden_col
=
tab
->
getColumn
(
hidden_no
);
NdbRecAttr
*
rec
=
m_value
[
hidden_no
].
rec
;
DBUG_ASSERT
(
rec
);
DBUG_PRINT
(
"hidden"
,
(
"%d: %s
\"
%llu
\"
"
,
hidden_no
,
hidden_col
->
getName
(),
rec
->
u_64_value
()));
DBUG_PRINT
(
"hidden"
,
(
"%d: %s
\"
%s
\"
"
,
hidden_no
,
hidden_col
->
getName
(),
llstr
(
rec
->
u_64_value
(),
buff
)));
}
print_results
();
#endif
...
...
strings/strtod.c
View file @
f25b4e04
...
...
@@ -26,8 +26,8 @@
*/
#include
"my_base.h"
/* Includes errno.h */
#include
"m_ctype.h"
#include
<my_global.h>
/* Includes errno.h */
#include
<m_ctype.h>
#define MAX_DBL_EXP 308
#define MAX_RESULT_FOR_MAX_EXP 1.79769313486232
...
...
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