Commit aee9a548 authored by unknown's avatar unknown
Browse files

Merge marko@build.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/marko/l/mysql-4.0
parents c98791c7 e35921a1

VC++Files/client/mysqlclient.dsp

+15 −11
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ CFG=mysqlclient - Win32 Debug 
# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=xicl6.exe

CPP=cl.exe

RSC=rc.exe



!IF  "$(CFG)" == "mysqlclient - Win32 Release"
@@ -48,7 +48,7 @@ RSC=rc.exe 
BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LIB32=xilink6.exe -lib

LIB32=link.exe -lib

# ADD BASE LIB32 /nologo

# ADD LIB32 /nologo /out:"..\lib_release\mysqlclient.lib"
@@ -72,7 +72,7 @@ LIB32=xilink6.exe -lib 
BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LIB32=xilink6.exe -lib

LIB32=link.exe -lib

# ADD BASE LIB32 /nologo

# ADD LIB32 /nologo /out:"..\lib_debug\mysqlclient.lib"
@@ -482,6 +482,10 @@ SOURCE=..\strings\strxmov.c 
# End Source File

# Begin Source File



SOURCE=..\strings\strxnmov.c

# End Source File

# Begin Source File



SOURCE=..\mysys\thr_mutex.c

# End Source File

# Begin Source File

VC++Files/mysql.dsw

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ Package=<5> 


Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name mysys

    End Project Dependency

}}}



###############################################################################

sql/item_timefunc.cc

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static bool get_interval_info(const char *str,uint length,uint count, 
  {

    longlong value;

    for (value=0; str != end && isdigit(*str) ; str++)

      value=value*10LL + (long) (*str - '0');

      value=value*LL(10) + (long) (*str - '0');

    values[i]= value;

    while (str != end && !isdigit(*str))

      str++;
@@ -1015,9 +1015,9 @@ bool Item_date_add_interval::get_date(TIME *ltime, bool fuzzy_date) 
      days--;

      sec+=3600*LL(24);

    }

    ltime->second=sec % 60;

    ltime->minute=sec/60 % 60;

    ltime->hour=sec/3600;

    ltime->second= (uint)(sec % 60);

    ltime->minute= (uint)(sec/60 % 60);

    ltime->hour=   (uint)(sec/3600);

    daynr= calc_daynr(ltime->year,ltime->month,1) + days;

    if ((ulonglong) daynr >= 3652424) // Day number from year 0 to 9999-12-31

      goto null_date;

sql/log_event.cc

+7 −10
Original line number Diff line number Diff line
@@ -1862,12 +1862,12 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) 
      else

      {

        slave_print_error(rli,expected_error, 

                          "query '%s' partially completed on the master \

                          "query partially completed on the master \

(error on master: %d) \

and was aborted. There is a chance that your master is inconsistent at this \

point. If you are sure that your master is ok, run this query manually on the\

 slave and then restart the slave with SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;\

 START SLAVE; .", thd->query, expected_error);

 START SLAVE; . Query: '%s'", expected_error, thd->query);

        thd->query_error= 1;

      }

      goto end;
@@ -1896,15 +1896,13 @@ point. If you are sure that your master is ok, run this query manually on the\ 
    {

      slave_print_error(rli, 0,

                        "\

Query '%s' caused different errors on master and slave. \

Query caused different errors on master and slave. \

Error on master: '%s' (%d), Error on slave: '%s' (%d). \

Default database: '%s'",

                        query,

Default database: '%s'. Query: '%s'",

                        ER_SAFE(expected_error),

                        expected_error,

                        actual_error ? thd->net.last_error: "no error",

                        actual_error,

                        print_slave_db_safe(db));

                        actual_error, print_slave_db_safe(db), query);

      thd->query_error= 1;

    }

    /*
@@ -1919,11 +1917,10 @@ Default database: '%s'", 
    else if (thd->query_error || thd->fatal_error)

    {

      slave_print_error(rli,actual_error,

                        "Error '%s' on query '%s'. Default database: '%s'",

                        "Error '%s' on query. Default database: '%s'. Query: '%s'",

                        (actual_error ? thd->net.last_error :

                         "unexpected success or fatal error"),

                        query,

                        print_slave_db_safe(db));

                        print_slave_db_safe(db), query);

      thd->query_error= 1;

    }

  } /* End of if (db_ok(... */

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -3674,7 +3674,7 @@ relay logs", 
   "Change the value of a variable. Please note that this option is deprecated;you can set variables directly with --variable-name=value.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"show-slave-auth-info", OPT_SHOW_SLAVE_AUTH_INFO,

   "Show user and password in SHOW SLAVE STATUS",

   "Show user and password in SHOW SLAVE HOSTS on this master",

   (gptr*) &opt_show_slave_auth_info, (gptr*) &opt_show_slave_auth_info, 0,

   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"concurrent-insert", OPT_CONCURRENT_INSERT,