Commit 50c10575 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
parents f93e070a 03a5cacc

.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

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;

include/mysys_err.h

+10 −5
Original line number Diff line number Diff line
@@ -26,10 +26,14 @@ extern "C" { 
extern const char * NEAR globerrs[];	/* my_error_messages is here */



/* Error message numbers in global map */

/* Do not add error numbers before EE_ERROR_FIRST. */

/* If necessary to add lower numbers, change EE_ERROR_FIRST accordingly. */

#define EE_ERROR_FIRST          0 /*Copy first error nr.*/

#define EE_FILENOTFOUND		0

/*

  Do not add error numbers before EE_ERROR_FIRST.

  If necessary to add lower numbers, change EE_ERROR_FIRST accordingly.



  We start with error 1 to not confuse peoples with 'error 0'

*/



#define EE_ERROR_FIRST          1 /*Copy first error nr.*/

#define EE_CANTCREATEFILE	1

#define EE_READ			2

#define EE_WRITE		3
@@ -57,7 +61,8 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ 
#define EE_REALPATH		26

#define EE_SYNC			27

#define EE_UNKNOWN_COLLATION	28

#define EE_ERROR_LAST           28 /*Copy last error nr.*/

#define EE_FILENOTFOUND		29

#define EE_ERROR_LAST           29 /*Copy last error nr.*/

/* Add error numbers before EE_ERROR_LAST and change it accordingly. */



  /* exit codes for all MySQL programs */

innobase/dict/dict0dict.c

+1 −1
Original line number Diff line number Diff line
@@ -2472,7 +2472,7 @@ dict_scan_id( 
		my_isspace(). Only after that, convert id names to UTF-8. */



		b = (byte*)(*id);

		id_len = strlen(b);

		id_len = strlen((char*) b);

		

		if (id_len >= 3 && b[id_len - 1] == 0xA0

			       && b[id_len - 2] == 0xC2) {