Commit 06e895d4 authored by unknown's avatar unknown
Browse files

Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 

into  naruto.:C:/cpp/mysql-5.0-maint
parents aabac4fc 0fbd4c9b

.bzrignore

+2 −1
Original line number Diff line number Diff line
@@ -698,6 +698,7 @@ mysql-test/gmon.out 
mysql-test/install_test_db

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run-shell

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster
@@ -967,6 +968,7 @@ ndb/src/kernel/error/liberror.dsp 
ndb/src/kernel/ndbd

ndb/src/kernel/ndbd.dsp

ndb/src/kernel/vm/libkernel.dsp

ndb/src/libndb.ver

ndb/src/libndbclient.dsp

ndb/src/mgmapi/libmgmapi.dsp

ndb/src/mgmclient/libndbmgmclient.dsp
@@ -1333,4 +1335,3 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj
 
ndb/src/libndb.ver

BitKeeper/etc/collapsed

+2 −0
Original line number Diff line number Diff line
@@ -39,3 +39,5 @@ 
45ba4faf2oqu6eR8fqecR3LfSNcYUg

45ba5238-NKl80QVXzdGo8hO9M75Xg

45c0fdfb2mz6NdOIsLenJtf6_ZelTA

45d1ffcd-r3v8A7uh92hQaMfQM9UPQ

45d21437Vg_-i4uOWyvzYWHESXDP6A

BitKeeper/etc/gone

+6 −0
Original line number Diff line number Diff line
@@ -456,6 +456,12 @@ arjen@fred.bitbike.com|scripts/mysql_fix_extensions.sh|20020516001337|12363|f104 
ccarkner@nslinuxw10.bedford.progress.com|mysql-test/r/isolation.result|20010327145543|25059|4da11e109a3d93a9

ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456

fs

jani@a88-113-38-195.elisa-laajakaista.fi|BUILD/SETUP.sh.rej|20070122013357|30052|b0650da46e7c4e54

jani@a88-113-38-195.elisa-laajakaista.fi|configure.in.rej|20070122013357|43533|4b7ec608b9c90e83

jani@a88-113-38-195.elisa-laajakaista.fi|include/my_global.h.rej|20070122013357|29911|dc7f1642f6061af

jani@a88-113-38-195.elisa-laajakaista.fi|include/my_pthread.h.rej|20070122013357|18348|a6b632d992e5df16

jani@a88-113-38-195.elisa-laajakaista.fi|mysys/thr_alarm.c.rej|20070122013357|21935|c169568388079966

jani@a88-113-38-195.elisa-laajakaista.fi|sql/mysqld.cc.rej|20070122013357|09337|84aad00c2111bc3

jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec

jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554

jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa

client/mysqltest.c

+28 −0
Original line number Diff line number Diff line
@@ -416,6 +416,8 @@ void verbose_msg(const char *fmt, ...) 
  ATTRIBUTE_FORMAT(printf, 1, 2);

void warning_msg(const char *fmt, ...)

  ATTRIBUTE_FORMAT(printf, 1, 2);

void log_msg(const char *fmt, ...)

  ATTRIBUTE_FORMAT(printf, 1, 2);



VAR* var_from_env(const char *, const char *);

VAR* var_init(VAR* v, const char *name, int name_len, const char *val,
@@ -578,6 +580,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query, 
	dynstr_append_mem(query_eval, p, 1);

      break;

    default:

      escaped= 0;

      dynstr_append_mem(query_eval, p, 1);

      break;

    }
@@ -943,6 +946,25 @@ void warning_msg(const char *fmt, ...) 
}





void log_msg(const char *fmt, ...)

{

  va_list args;

  char buff[512];

  size_t len;

  DBUG_ENTER("log_msg");



  memset(buff, 0, sizeof(buff));

  va_start(args, fmt);

  len= my_vsnprintf(buff, sizeof(buff)-1, fmt, args);

  va_end(args);



  dynstr_append_mem(&ds_res, buff, len);

  dynstr_append(&ds_res, "\n");



  DBUG_VOID_RETURN;

}





/*

  Compare content of the string ds to content of file fname

*/
@@ -1615,7 +1637,11 @@ void do_exec(struct st_command *command) 
    my_bool ok= 0;



    if (command->abort_on_error)

    {

      log_msg("exec of '%s failed, error: %d, status: %d, errno: %d",

              ds_cmd.str, error, status, errno);

      die("command \"%s\" failed", command->first_argument);

    }



    DBUG_PRINT("info",

               ("error: %d, status: %d", error, status));
@@ -1639,6 +1665,8 @@ void do_exec(struct st_command *command) 
           command->expected_errors.err[0].code.errnum != 0)

  {

    /* Error code we wanted was != 0, i.e. not an expected success */

    log_msg("exec of '%s failed, error: %d, errno: %d",

            ds_cmd.str, error, errno);

    die("command \"%s\" succeeded - should have failed with errno %d...",

        command->first_argument, command->expected_errors.err[0].code.errnum);

  }

mysql-test/mysql-test-run.pl

+6 −0
Original line number Diff line number Diff line
@@ -3581,6 +3581,12 @@ sub mysqld_arguments ($$$$$) { 
  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);

  mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);



  if ( $mysql_version_id >= 50036)

  {

    # Prevent the started mysqld to access files outside of vardir

    mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir);

  }



  if ( $mysql_version_id >= 50000 )

  {

    mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);