- /* Find mysqlcheck */
- if (find_file(mysqlcheck_name, basedir, MYF(0), path, sizeof(path),
-- "bin", EXTRA_CLIENT_PATHS, NullS))
-+ "sbin", EXTRA_CLIENT_PATHS, NullS))
+ static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
+ opt_systables_only, opt_version_check;
+ static uint my_end_arg= 0;
+-static char *opt_user= (char*)"root";
++static char *opt_user= (char*)"mysql";
+
+ static DYNAMIC_STRING ds_args;
+ static DYNAMIC_STRING conn_args;
+@@ -923,15 +923,7 @@
+ dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS);
+ dynstr_append(&ds_args, " ");
+
+- /* Find mysql */
+- find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name);
+-
+- if (!opt_systables_only)
+- {
+- /* Find mysqlcheck */
+- find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name);
+- }
+- else
++ if (opt_systables_only)