Commit 89f616a6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 2ca5f52b e4d12c5a

.bzrignore

+45 −0
Original line number Diff line number Diff line
@@ -775,13 +775,45 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so 
ndb/lib/libREP_API.so

ndb/lib/libndbclient.so

ndb/lib/libndbclient_extra.so

ndb/src/common/debugger/libtrace.dsp

ndb/src/common/debugger/signaldata/libsignaldataprint.dsp

ndb/src/common/logger/liblogger.dsp

ndb/src/common/mgmcommon/libmgmsrvcommon.dsp

ndb/src/common/mgmcommon/printConfig/*.d

ndb/src/common/portlib/libportlib.dsp

ndb/src/common/transporter/libtransporter.dsp

ndb/src/common/util/libgeneral.dsp

ndb/src/cw/cpcd/ndb_cpcd

ndb/src/kernel/blocks/backup/libbackup.dsp

ndb/src/kernel/blocks/backup/restore/ndb_restore

ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp

ndb/src/kernel/blocks/dbacc/libdbacc.dsp

ndb/src/kernel/blocks/dbdict/libdbdict.dsp

ndb/src/kernel/blocks/dbdih/libdbdih.dsp

ndb/src/kernel/blocks/dblqh/libdblqh.dsp

ndb/src/kernel/blocks/dbtc/libdbtc.dsp

ndb/src/kernel/blocks/dbtup/libdbtup.dsp

ndb/src/kernel/blocks/dbtux/libdbtux.dsp

ndb/src/kernel/blocks/dbutil/libdbutil.dsp

ndb/src/kernel/blocks/grep/libgrep.dsp

ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp

ndb/src/kernel/blocks/ndbfs/libndbfs.dsp

ndb/src/kernel/blocks/qmgr/libqmgr.dsp

ndb/src/kernel/blocks/suma/libsuma.dsp

ndb/src/kernel/blocks/trix/libtrix.dsp

ndb/src/kernel/error/liberror.dsp

ndb/src/kernel/ndbd

ndb/src/kernel/ndbd.dsp

ndb/src/kernel/vm/libkernel.dsp

ndb/src/libndbclient.dsp

ndb/src/mgmapi/libmgmapi.dsp

ndb/src/mgmclient/libndbmgmclient.dsp

ndb/src/mgmclient/ndb_mgm

ndb/src/mgmclient/ndb_mgm.dsp

ndb/src/mgmclient/test_cpcd/*.d

ndb/src/mgmsrv/ndb_mgmd

ndb/src/mgmsrv/ndb_mgmd.dsp

ndb/src/ndbapi/libndbapi.dsp

ndb/test/ndbapi/bank/bankCreator

ndb/test/ndbapi/bank/bankMakeGL

ndb/test/ndbapi/bank/bankSumAccounts
@@ -794,12 +826,15 @@ ndb/test/ndbapi/create_tab 
ndb/test/ndbapi/drop_all_tabs

ndb/test/ndbapi/flexAsynch

ndb/test/ndbapi/flexBench

ndb/test/ndbapi/flexBench.dsp

ndb/test/ndbapi/flexHammer

ndb/test/ndbapi/flexTT

ndb/test/ndbapi/testBackup

ndb/test/ndbapi/testBasic

ndb/test/ndbapi/testBasic.dsp

ndb/test/ndbapi/testBasicAsynch

ndb/test/ndbapi/testBlobs

ndb/test/ndbapi/testBlobs.dsp

ndb/test/ndbapi/testDataBuffers

ndb/test/ndbapi/testDeadlock

ndb/test/ndbapi/testDict
@@ -811,6 +846,7 @@ ndb/test/ndbapi/testOIBasic 
ndb/test/ndbapi/testOperations

ndb/test/ndbapi/testRestartGci

ndb/test/ndbapi/testScan

ndb/test/ndbapi/testScan.dsp

ndb/test/ndbapi/testScanInterpreter

ndb/test/ndbapi/testScanPerf

ndb/test/ndbapi/testSystemRestart
@@ -818,6 +854,7 @@ ndb/test/ndbapi/testTimeout 
ndb/test/ndbapi/testTransactions

ndb/test/ndbapi/test_event

ndb/test/run-test/atrt

ndb/test/src/libNDBT.dsp

ndb/test/tools/copy_tab

ndb/test/tools/create_index

ndb/test/tools/hugoCalculator
@@ -834,15 +871,23 @@ ndb/test/tools/ndb_cpcc 
ndb/test/tools/restart

ndb/test/tools/verify_index

ndb/tools/ndb_delete_all

ndb/tools/ndb_delete_all.dsp

ndb/tools/ndb_desc

ndb/tools/ndb_desc.dsp

ndb/tools/ndb_drop_index

ndb/tools/ndb_drop_index.dsp

ndb/tools/ndb_drop_table

ndb/tools/ndb_drop_table.dsp

ndb/tools/ndb_restore

ndb/tools/ndb_select_all

ndb/tools/ndb_select_all.dsp

ndb/tools/ndb_select_count

ndb/tools/ndb_select_count.dsp

ndb/tools/ndb_show_tables

ndb/tools/ndb_show_tables.dsp

ndb/tools/ndb_test_platform

ndb/tools/ndb_waiter

ndb/tools/ndb_waiter.dsp

ndbcluster-1186

ndbcluster-1186/SCCS

ndbcluster-1186/config.ini

client/mysql.cc

+21 −18
Original line number Diff line number Diff line
@@ -1593,6 +1593,22 @@ static int reconnect(void) 
  return 0;

}



static void get_current_db()

{

  MYSQL_RES *res;



  my_free(current_db, MYF(MY_ALLOW_ZERO_PTR));

  current_db= NULL;

  /* In case of error below current_db will be NULL */

  if (!mysql_query(&mysql, "SELECT DATABASE()") &&

      (res= mysql_use_result(&mysql)))

  {

    MYSQL_ROW row= mysql_fetch_row(res);

    if (row[0])

      current_db= my_strdup(row[0], MYF(MY_WME));

    mysql_free_result(res);

  }

}



/***************************************************************************

 The different commands
@@ -1917,6 +1933,10 @@ com_go(String *buffer,char *line __attribute__((unused))) 
  if (err >= 1)

    error= put_error(&mysql);



  if (!error && !status.batch && 

      (mysql.server_status & SERVER_STATUS_DB_DROPPED))

    get_current_db();



  return error;				/* New command follows */

}
@@ -2631,24 +2651,7 @@ com_use(String *buffer __attribute__((unused)), char *line) 
    under our feet, for example if DROP DATABASE or RENAME DATABASE

    (latter one not yet available by the time the comment was written)

  */

  /*  Let's reset current_db, assume it's gone */

  my_free(current_db, MYF(MY_ALLOW_ZERO_PTR));

  current_db= 0;

  /*

    We don't care about in case of an error below because current_db

    was just set to 0.

  */

  if (!mysql_query(&mysql, "SELECT DATABASE()") &&

      (res= mysql_use_result(&mysql)))

  {

    row= mysql_fetch_row(res);

    if (row[0])

    {

      current_db= my_strdup(row[0], MYF(MY_WME));

    }

    (void) mysql_fetch_row(res);               // Read eof

    mysql_free_result(res);

  }

  get_current_db();



  if (!current_db || cmp_database(charset_info, current_db,tmp))

  {

client/mysqldump.c

+5 −0
Original line number Diff line number Diff line
@@ -865,6 +865,11 @@ static int dbConnect(char *host, char *user,char *passwd) 
    DBerror(&mysql_connection, "when trying to connect");

    return 1;

  }

  /*

    Don't dump SET NAMES with a pre-4.1 server (bug#7997).

  */

  if (mysql_get_server_version(&mysql_connection) < 40100)

    opt_set_charset= 0;

  /*

    As we're going to set SQL_MODE, it would be lost on reconnect, so we

    cannot reconnect.

extra/comp_err.c

+2 −2
Original line number Diff line number Diff line
@@ -332,13 +332,13 @@ static int create_sys_files(struct languages *lang_head, 
    head[30]= csnum;



    my_fseek(to, 0l, MY_SEEK_SET, MYF(0));

    if (my_fwrite(to, head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP)))

    if (my_fwrite(to, (byte*) head, HEADER_LENGTH, MYF(MY_WME | MY_FNABP)))

      goto err;



    for (i= 0; i < row_count; i++)

    {

      int2store(head, file_pos[i]);

      if (my_fwrite(to, head, 2, MYF(MY_WME | MY_FNABP)))

      if (my_fwrite(to, (byte*) head, 2, MYF(MY_WME | MY_FNABP)))

	goto err;

    }

    my_fclose(to, MYF(0));

extra/perror.c

+2 −1
Original line number Diff line number Diff line
@@ -250,7 +250,8 @@ int main(int argc,char *argv[]) 
        'Unknown Error' (without regard to case).

      */

      if (msg &&

          my_strnncoll(&my_charset_latin1, msg, 13, "Unknown Error", 13) &&

          my_strnncoll(&my_charset_latin1, (const uchar*) msg, 13,

                       (const uchar*) "Unknown Error", 13) &&

          (!unknown_error || strcmp(msg, unknown_error)))

      {

	found=1;