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
65a711f4
Commit
65a711f4
authored
Aug 10, 2001
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow myisam-recover="" and --sql-mode=""
parent
8a9d6072
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
154 additions
and
53 deletions
+154
-53
Docs/manual.texi
Docs/manual.texi
+139
-46
mysql-test/r/distinct.result
mysql-test/r/distinct.result
+6
-0
mysql-test/r/innodb.result
mysql-test/r/innodb.result
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+8
-6
No files found.
Docs/manual.texi
View file @
65a711f4
This diff is collapsed.
Click to expand it.
mysql-test/r/distinct.result
View file @
65a711f4
...
...
@@ -167,3 +167,9 @@ a sec_to_time(sum(time_to_sec(t)))
a sec_to_time(sum(time_to_sec(t)))
1 00:06:15
1 00:36:30
a
4
3
a c
4 NULL
3 NULL
mysql-test/r/innodb.result
View file @
65a711f4
...
...
@@ -438,7 +438,7 @@ hello 1
Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support check/repair
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
t1 0 PRIMARY 1 a A
1
NULL NULL
t1 0 PRIMARY 1 a A
2
NULL NULL
i j
1 2
i j
...
...
sql/mysqld.cc
View file @
65a711f4
...
...
@@ -3733,7 +3733,7 @@ static void get_options(int argc,char **argv)
#endif
/* HAVE_INNOBASE_DB */
case
OPT_MYISAM_RECOVER
:
{
if
(
!
optarg
||
!
optarg
[
0
]
)
if
(
!
optarg
)
{
myisam_recover_options
=
HA_RECOVER_DEFAULT
;
myisam_recover_options_str
=
myisam_recover_typelib
.
type_names
[
0
];
...
...
@@ -3760,8 +3760,9 @@ static void get_options(int argc,char **argv)
fprintf
(
stderr
,
"Unknown option to sql-mode: %s
\n
"
,
optarg
);
exit
(
1
);
}
if
(
opt_sql_mode
&
MODE_SERIALIZABLE
)
default_tx_isolation
=
ISO_SERIALIZABLE
;
default_tx_isolation
=
((
opt_sql_mode
&
MODE_SERIALIZABLE
)
?
ISO_SERIALIZABLE
:
ISO_READ_COMMITTED
);
break
;
}
case
OPT_MASTER_HOST
:
...
...
@@ -4393,9 +4394,10 @@ static ulong find_bit_type(const char *x, TYPELIB *bit_lib)
DBUG_PRINT
(
"enter"
,(
"x: '%s'"
,
x
));
found
=
0
;
found_end
=
0
;
pos
=
(
my_string
)
x
;
do
while
(
*
pos
==
' '
)
pos
++
;
found_end
=
*
pos
==
0
;
while
(
!
found_end
)
{
if
(
!*
(
end
=
strcend
(
pos
,
','
)))
/* Let end point at fieldend */
{
...
...
@@ -4428,7 +4430,7 @@ skipp: ;
DBUG_RETURN
(
~
(
ulong
)
0
);
// No unique value
found
|=
found_int
;
pos
=
end
+
1
;
}
while
(
!
found_end
);
}
DBUG_PRINT
(
"exit"
,(
"bit-field: %ld"
,(
ulong
)
found
));
DBUG_RETURN
(
found
);
...
...
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