database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel

Browse Source 
into  mysql.com:/home/my/mysql-5.1


client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
This commit is contained in:
unknown
2007-03-24 11:06:09 +02:00
parent 212ecf348c c59dba87b6
commit e2a3fdd1fe
19 changed files with 271 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/mysqlbinlog.cc
View File

@@ -946,14 +946,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
remote_opt= 1;
break;
case OPT_MYSQL_PROTOCOL:
{
if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)
{
fprintf(stderr, "Unknown option to protocol: %s\n", argument);
exit(1);
}
opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
opt->name);
break;
}
case OPT_START_DATETIME:
start_datetime= convert_str_to_timestamp(start_datetime_str);
break;