Commit 1ddd584a authored by unknown's avatar unknown

Allow myisam-recover="" and --sql-mode=""


Docs/manual.texi:
  Changelog
mysql-test/r/distinct.result:
  new test case
mysql-test/r/innodb.result:
  Fixed result
parent 73e86d62
This diff is collapsed.
...@@ -167,3 +167,9 @@ a sec_to_time(sum(time_to_sec(t))) ...@@ -167,3 +167,9 @@ a sec_to_time(sum(time_to_sec(t)))
a sec_to_time(sum(time_to_sec(t))) a sec_to_time(sum(time_to_sec(t)))
1 00:06:15 1 00:06:15
1 00:36:30 1 00:36:30
a
4
3
a c
4 NULL
3 NULL
...@@ -438,7 +438,7 @@ hello 1 ...@@ -438,7 +438,7 @@ hello 1
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support check/repair 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 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 i j
1 2 1 2
i j i j
......
...@@ -3733,7 +3733,7 @@ static void get_options(int argc,char **argv) ...@@ -3733,7 +3733,7 @@ static void get_options(int argc,char **argv)
#endif /* HAVE_INNOBASE_DB */ #endif /* HAVE_INNOBASE_DB */
case OPT_MYISAM_RECOVER: case OPT_MYISAM_RECOVER:
{ {
if (!optarg || !optarg[0]) if (!optarg)
{ {
myisam_recover_options= HA_RECOVER_DEFAULT; myisam_recover_options= HA_RECOVER_DEFAULT;
myisam_recover_options_str= myisam_recover_typelib.type_names[0]; myisam_recover_options_str= myisam_recover_typelib.type_names[0];
...@@ -3760,8 +3760,9 @@ static void get_options(int argc,char **argv) ...@@ -3760,8 +3760,9 @@ static void get_options(int argc,char **argv)
fprintf(stderr, "Unknown option to sql-mode: %s\n", optarg); fprintf(stderr, "Unknown option to sql-mode: %s\n", optarg);
exit(1); exit(1);
} }
if (opt_sql_mode & MODE_SERIALIZABLE) default_tx_isolation= ((opt_sql_mode & MODE_SERIALIZABLE) ?
default_tx_isolation= ISO_SERIALIZABLE; ISO_SERIALIZABLE :
ISO_READ_COMMITTED);
break; break;
} }
case OPT_MASTER_HOST: case OPT_MASTER_HOST:
...@@ -4393,9 +4394,10 @@ static ulong find_bit_type(const char *x, TYPELIB *bit_lib) ...@@ -4393,9 +4394,10 @@ static ulong find_bit_type(const char *x, TYPELIB *bit_lib)
DBUG_PRINT("enter",("x: '%s'",x)); DBUG_PRINT("enter",("x: '%s'",x));
found=0; found=0;
found_end= 0;
pos=(my_string) x; pos=(my_string) x;
do while (*pos == ' ') pos++;
found_end= *pos == 0;
while (!found_end)
{ {
if (!*(end=strcend(pos,','))) /* Let end point at fieldend */ if (!*(end=strcend(pos,','))) /* Let end point at fieldend */
{ {
...@@ -4428,7 +4430,7 @@ skipp: ; ...@@ -4428,7 +4430,7 @@ skipp: ;
DBUG_RETURN(~(ulong) 0); // No unique value DBUG_RETURN(~(ulong) 0); // No unique value
found|=found_int; found|=found_int;
pos=end+1; pos=end+1;
} while (! found_end); }
DBUG_PRINT("exit",("bit-field: %ld",(ulong) found)); DBUG_PRINT("exit",("bit-field: %ld",(ulong) found));
DBUG_RETURN(found); DBUG_RETURN(found);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment