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
8c94b5fb
Commit
8c94b5fb
authored
Jun 06, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
parents
dec2607e
d83c495b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
client/mysqltest.c
client/mysqltest.c
+6
-5
myisam/mi_create.c
myisam/mi_create.c
+1
-1
mysys/default.c
mysys/default.c
+1
-1
mysys/my_handler.c
mysys/my_handler.c
+1
-1
No files found.
client/mysqltest.c
View file @
8c94b5fb
...
...
@@ -246,6 +246,7 @@ typedef struct
static
char
*
subst_env_var
(
const
char
*
cmd
);
static
FILE
*
my_popen
(
const
char
*
cmd
,
const
char
*
mode
);
#undef popen
#define popen(A,B) my_popen((A),(B))
#endif
/* __NETWARE__ */
...
...
@@ -2587,13 +2588,13 @@ static void append_result(DYNAMIC_STRING *ds, MYSQL_RES *res)
{
if
(
i
)
dynstr_append_mem
(
ds
,
"
\t
"
,
1
);
replace_dynstr_append_mem
(
ds
,
val
,
len
);
replace_dynstr_append_mem
(
ds
,
val
,
(
int
)
len
);
}
else
{
dynstr_append
(
ds
,
fields
[
i
].
name
);
dynstr_append_mem
(
ds
,
"
\t
"
,
1
);
replace_dynstr_append_mem
(
ds
,
val
,
len
);
replace_dynstr_append_mem
(
ds
,
val
,
(
int
)
len
);
dynstr_append_mem
(
ds
,
"
\n
"
,
1
);
}
}
...
...
@@ -2960,7 +2961,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
int
error
=
0
;
/* Function return code if "goto end;" */
int
err
;
/* Temporary storage of return code from calls */
int
query_len
,
got_error_on_execute
;
u
int
num_rows
;
u
longlong
num_rows
;
char
*
query
;
MYSQL_RES
*
res
=
NULL
;
/* Note that here 'res' is meta data result set */
DYNAMIC_STRING
*
ds
;
...
...
@@ -3215,13 +3216,13 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)
{
if
(
col_idx
)
/* No tab before first col */
dynstr_append_mem
(
ds
,
"
\t
"
,
1
);
replace_dynstr_append_mem
(
ds
,
val
,
len
);
replace_dynstr_append_mem
(
ds
,
val
,
(
int
)
len
);
}
else
{
dynstr_append
(
ds
,
field
[
col_idx
].
name
);
dynstr_append_mem
(
ds
,
"
\t
"
,
1
);
replace_dynstr_append_mem
(
ds
,
val
,
len
);
replace_dynstr_append_mem
(
ds
,
val
,
(
int
)
len
);
dynstr_append_mem
(
ds
,
"
\n
"
,
1
);
}
}
...
...
myisam/mi_create.c
View file @
8c94b5fb
...
...
@@ -667,7 +667,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
{
tmp_keydef
.
keysegs
=
1
;
tmp_keydef
.
flag
=
HA_UNIQUE_CHECK
;
tmp_keydef
.
block_length
=
myisam_block_size
;
tmp_keydef
.
block_length
=
(
uint16
)
myisam_block_size
;
tmp_keydef
.
keylength
=
MI_UNIQUE_HASH_LENGTH
+
pointer
;
tmp_keydef
.
minlength
=
tmp_keydef
.
maxlength
=
tmp_keydef
.
keylength
;
tmp_keyseg
.
type
=
MI_UNIQUE_HASH_TYPE
;
...
...
mysys/default.c
View file @
8c94b5fb
...
...
@@ -850,7 +850,7 @@ static void init_default_directories()
*
ptr
++=
"C:/"
;
if
(
GetWindowsDirectory
(
system_dir
,
sizeof
(
system_dir
)))
*
ptr
++=
&
system_dir
;
*
ptr
++=
(
char
*
)
&
system_dir
;
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
/* Only VC7 and up */
/* Only add shared system directory if different from default. */
...
...
mysys/my_handler.c
View file @
8c94b5fb
...
...
@@ -23,7 +23,7 @@ int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,
{
if
(
!
part_key
)
return
charset_info
->
coll
->
strnncollsp
(
charset_info
,
a
,
a_length
,
b
,
b_length
,
!
skip_end_space
);
b
,
b_length
,
(
my_bool
)
!
skip_end_space
);
return
charset_info
->
coll
->
strnncoll
(
charset_info
,
a
,
a_length
,
b
,
b_length
,
part_key
);
}
...
...
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