1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-5.0-clean

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


BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
This commit is contained in:
unknown 2006-05-01 11:38:15 -07:00
commit 839a5dea86
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysql_upgrade.c
View File

@ -135,7 +135,9 @@ static int create_check_file(const char *path)
if (check_file < 0) if (check_file < 0)
return 1; return 1;
error= my_write(check_file, VERSION, strlen(VERSION), MYF(MY_WME | MY_FNABP)); error= my_write(check_file,
MYSQL_SERVER_VERSION, strlen(MYSQL_SERVER_VERSION),
MYF(MY_WME | MY_FNABP));
error= my_close(check_file, MYF(MY_FAE | MY_WME)) || error; error= my_close(check_file, MYF(MY_FAE | MY_WME)) || error;
return error; return error;
} }
@ -243,7 +245,7 @@ int main(int argc, char **argv)
&& (test_file_exists("./bin", "mysqld") || && (test_file_exists("./bin", "mysqld") ||
test_file_exists("./libexec", "mysqld"))) test_file_exists("./libexec", "mysqld")))
{ {
getcwd(bindir, sizeof(bindir)); my_getwd(bindir, sizeof(bindir), MYF(0));
bindir_end= bindir + strlen(bindir); bindir_end= bindir + strlen(bindir);
} }
else else

9
client/mysqltest.c
View File

@ -153,7 +153,7 @@ static uint global_expected_errors;
/* ************************************************************************ */ /* ************************************************************************ */
static int record = 0, opt_sleep=0; static int record= 0, opt_sleep= -1;
static char *db = 0, *pass=0; static char *db = 0, *pass=0;
const char *user = 0, *host = 0, *unix_sock = 0, *opt_basedir="./"; const char *user = 0, *host = 0, *unix_sock = 0, *opt_basedir="./";
const char *opt_include= 0; const char *opt_include= 0;
@ -1880,11 +1880,12 @@ int do_sleep(struct st_query *query, my_bool real_sleep)
query->first_argument); query->first_argument);
/* Fixed sleep time selected by --sleep option */ /* Fixed sleep time selected by --sleep option */
if (opt_sleep && !real_sleep) if (opt_sleep >= 0 && !real_sleep)
sleep_val= opt_sleep; sleep_val= opt_sleep;
DBUG_PRINT("info", ("sleep_val: %f", sleep_val)); DBUG_PRINT("info", ("sleep_val: %f", sleep_val));
my_sleep((ulong) (sleep_val * 1000000L)); if (sleep_val)
my_sleep((ulong) (sleep_val * 1000000L));
query->last_argument= sleep_end; query->last_argument= sleep_end;
return 0; return 0;
} }
@ -3310,7 +3311,7 @@ static struct my_option my_long_options[] =
"Don't use the memory allocation checking.", 0, 0, 0, GET_NO_ARG, NO_ARG, "Don't use the memory allocation checking.", 0, 0, 0, GET_NO_ARG, NO_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
{"sleep", 'T', "Sleep always this many seconds on sleep commands.", {"sleep", 'T', "Sleep always this many seconds on sleep commands.",
(gptr*) &opt_sleep, (gptr*) &opt_sleep, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, (gptr*) &opt_sleep, (gptr*) &opt_sleep, 0, GET_INT, REQUIRED_ARG, -1, 0, 0,
0, 0, 0}, 0, 0, 0},
{"socket", 'S', "Socket file to use for connection.", {"socket", 'S', "Socket file to use for connection.",
(gptr*) &unix_sock, (gptr*) &unix_sock, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, (gptr*) &unix_sock, (gptr*) &unix_sock, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,

1
include/config-win.h
View File

@ -382,6 +382,7 @@ inline double ulonglong2double(ulonglong value)
#include <custom_conf.h> #include <custom_conf.h>
#else #else
#define DEFAULT_MYSQL_HOME "c:\\mysql" #define DEFAULT_MYSQL_HOME "c:\\mysql"
#define DATADIR "c:\\mysql\\data"
#define PACKAGE "mysql" #define PACKAGE "mysql"
#define DEFAULT_BASEDIR "C:\\" #define DEFAULT_BASEDIR "C:\\"
#define SHAREDIR "share" #define SHAREDIR "share"

3
sql/repl_failsafe.cc
View File

@ -861,7 +861,8 @@ bool load_master_data(THD* thd)
if (!rpl_filter->db_ok(db) || if (!rpl_filter->db_ok(db) ||
!rpl_filter->db_ok_with_wild_table(db) || !rpl_filter->db_ok_with_wild_table(db) ||
!strcmp(db,"mysql")) !strcmp(db,"mysql") ||
is_schema_db(db))
{ {
*cur_table_res = 0; *cur_table_res = 0;
continue; continue;