Commit 86c4e1d2 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
configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 2f11b617 dbfce2a5

.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
@@ -52,6 +52,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

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# Don't forget to also update the NDB lines below.

AM_INIT_AUTOMAKE(mysql, 5.0.7-beta)

AM_INIT_AUTOMAKE(mysql, 5.0.8-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=7

NDB_VERSION_BUILD=8

NDB_VERSION_STATUS="beta"



# Set all version vars based on $VERSION. How do we do this more elegant ?

myisam/mi_rnext_same.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int mi_rnext_same(MI_INFO *info, byte *buf) 
			       info->lastkey_length,SEARCH_BIGGER,

			       info->s->state.key_root[inx])))

          break;

        if (ha_key_cmp(keyinfo->seg,info->lastkey2,info->lastkey,

        if (ha_key_cmp(keyinfo->seg, info->lastkey, info->lastkey2,

                       info->last_rkey_length, SEARCH_FIND, &not_used))

        {

          error=1;

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