Commit a02db761 authored by unknown's avatar unknown
Browse files

merge 


BitKeeper/etc/logging_ok:
  auto-union
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/ndb/include/kernel/AttributeList.hpp:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/make-config.sh:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents 0de81f00 71e9d6ef

.bzrignore

+10 −9
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ Makefile.in 
Makefile.in'

PENDING/*

TAGS

VC++Files/client/mysql_amd64.dsp

ac_available_languages_fragment

acinclude.m4

aclocal.m4
@@ -274,6 +275,8 @@ client/mysqlmanager-pwgen 
client/mysqlmanagerc

client/mysqlshow

client/mysqltest

client/mysqltestmanager-pwgen

client/mysqltestmanagerc

client/mysys_priv.h

client/select_test

client/ssl_test
@@ -284,10 +287,12 @@ cmd-line-utils/libedit/common.h 
cmd-line-utils/libedit/makelist

comon.h

config.cache

config.guess

config.h

config.h.in

config.log

config.status

config.sub

configure

configure.lineno

core
@@ -355,6 +360,7 @@ innobase/ib_config.h.in 
innobase/stamp-h1

insert_test

install

install-sh

isam/isamchk

isam/isamlog

isam/pack_isam
@@ -519,7 +525,9 @@ linked_libmysqldex_sources 
linked_server_sources

linked_tools_sources

locked

ltmain.sh

man/*.1

missing

mit-pthreads/config.flags

mit-pthreads/include/bits

mit-pthreads/include/pthread/machdep.h
@@ -936,6 +944,7 @@ scripts/mysqld_multi 
scripts/mysqld_safe

scripts/mysqldumpslow

scripts/mysqlhotcopy

scripts/mysqlhotcopy.sh.rej

scripts/safe_mysqld

select_test

server-tools/instance-manager/client.c
@@ -1100,18 +1109,10 @@ tmp/* 
tools/my_vsnprintf.c

tools/mysqlmanager

tools/mysqlmngd

tools/mysqltestmanager

tools/mysys_priv.h

vi.h

vio/test-ssl

vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
VC++Files/client/mysql_amd64.dsp

client/mysqltestmanager-pwgen

client/mysqltestmanagerc

tools/mysqltestmanager

config.guess

config.sub

install-sh

ltmain.sh

missing

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

elliot@mysql.com

evgen@moonbone.(none)

evgen@moonbone.local

gbichot@bk-internal.mysql.com

mysql-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ install-data-local: 
		$(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)

	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t

mysql-test/include/ps_modify.inc

+2 −5
Original line number Diff line number Diff line
@@ -174,11 +174,8 @@ where a=2 
limit 1';

execute stmt1 ;

select a,b from t1 where b = 'bla' ;

# currently (May 2004, Version 4.1) it is impossible

-- error 1064

prepare stmt1 from 'update t1 set b=''bla''

where a=2

limit ?';

prepare stmt1 from 'update t1 set b=''bla'' where a=2 limit ?';

execute stmt1 using @arg00;



--disable_query_log

select '------ insert tests ------' as test_sequence ;

mysql-test/include/ps_query.inc

+2 −4
Original line number Diff line number Diff line
@@ -300,10 +300,8 @@ set @arg00=1; 
prepare stmt1 from ' select a,b from t1 order by a

limit 1 ';

execute stmt1 ;

# currently (May 2004, Version 4.1) it is impossible

-- error 1064

prepare stmt1 from ' select a,b from t1

limit ? ';

prepare stmt1 from ' select a,b from t1 limit ? ';

execute stmt1 using @arg00;



##### parameter used in many places

set @arg00='b' ;