Commit 9f2d21f6 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/ram/work/mysql-5.0
parents 38af49e6 3443a37d

mysql-test/r/type_decimal.result

+7 −0
Original line number Diff line number Diff line
@@ -772,3 +772,10 @@ productid zlevelprice 
003trans	39.98

004trans	31.18

drop table t1, t2;

create table t1 (f1 decimal(5));

insert into t1 values (40);

flush tables;

select f1 from t1 where f1 in (select f1 from t1);

f1

40

drop table t1;

mysql-test/t/type_decimal.test

+8 −0
Original line number Diff line number Diff line
@@ -377,3 +377,11 @@ insert INTO t2 SELECT * FROM t1; 
select * from t2; 

drop table t1, t2;



#

# Bug #17826 'type_decimal' fails with ps-protocol

#

create table t1 (f1 decimal(5));

insert into t1 values (40);

flush tables;

select f1 from t1 where f1 in (select f1 from t1);

drop table t1;

server-tools/instance-manager/Makefile.am

+6 −5
Original line number Diff line number Diff line
@@ -24,9 +24,10 @@ DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER 
# default_options.h, generated from default_options.h.in)

# See automake/autoconf docs for details



noinst_LIBRARIES= liboptions.a libnet.a

noinst_LTLIBRARIES= liboptions.la

noinst_LIBRARIES=   libnet.a



liboptions_a_CXXFLAGS= $(CXXFLAGS) \

liboptions_la_CXXFLAGS= $(CXXFLAGS) \

	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \

	-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \

	-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \
@@ -35,8 +36,8 @@ liboptions_a_CXXFLAGS= $(CXXFLAGS) \ 
	-DDEFAULT_CONFIG_FILE="/etc/my.cnf" \

	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@



liboptions_a_SOURCES= options.h options.cc priv.h priv.cc

liboptions_a_LIBADD= $(top_builddir)/libmysql/get_password.$(OBJEXT)

liboptions_la_SOURCES= options.h options.cc priv.h priv.cc

liboptions_la_LIBADD= $(top_builddir)/libmysql/get_password.lo



# MySQL sometimes uses symlinks to reuse code 

# All symlinked files are grouped in libnet.a
@@ -77,7 +78,7 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ 
                        mysql_manager_error.h \

                        portability.h



mysqlmanager_LDADD=	liboptions.a \

mysqlmanager_LDADD=	liboptions.la \

			libnet.a \

			$(top_builddir)/vio/libvio.a \

			$(top_builddir)/mysys/libmysys.a \

sql/item_cmpfunc.cc

+0 −6
Original line number Diff line number Diff line
@@ -698,12 +698,6 @@ bool Item_in_optimizer::fix_left(THD *thd, Item **ref) 
    return 1;



  cache->setup(args[0]);

  /*

    If it is preparation PS only then we do not know values of parameters =>

    cant't get there values and do not need that values.

  */

  if (!thd->stmt_arena->is_stmt_prepare())

    cache->store(args[0]);

  if (cache->cols() == 1)

  {

    if ((used_tables_cache= args[0]->used_tables()))

support-files/mysql.spec.sh

+24 −20
Original line number Diff line number Diff line
@@ -204,24 +204,24 @@ the standard MySQL package. 


Please note that this is a dynamically linked binary!



%package embedded

Requires: %{name}-devel

Summary: MySQL - embedded library

Group: Applications/Databases

Obsoletes: mysql-embedded



%description embedded

This package contains the MySQL server as an embedded library.



The embedded MySQL server library makes it possible to run a

full-featured MySQL server inside the client application.

The main benefits are increased speed and more simple management

for embedded applications.



The API is identical for the embedded MySQL version and the

client/server version.



%{see_base}

#%package embedded

#Requires: %{name}-devel

#Summary: MySQL - embedded library

#Group: Applications/Databases

#Obsoletes: mysql-embedded

#

#%description embedded

#This package contains the MySQL server as an embedded library.

#

#The embedded MySQL server library makes it possible to run a

#full-featured MySQL server inside the client application.

#The main benefits are increased speed and more simple management

#for embedded applications.

#

#The API is identical for the embedded MySQL version and the

#client/server version.

#

#%{see_base}



%prep

%setup -n mysql-%{mysql_version}
@@ -712,14 +712,18 @@ fi 
%attr(755, root, root) %{_sbindir}/mysqld-max

%attr(644, root, root) %{_libdir}/mysql/mysqld-max.sym



%files embedded

%defattr(-, root, root, 0755)

#%files embedded

#%defattr(-, root, root, 0755)

# %attr(644, root, root) %{_libdir}/mysql/libmysqld.a



# The spec file changelog only includes changes made to the spec file

# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Fri Mar 03 2006 Kent Boortz <kent@mysql.com>



- Don't output an embedded package as it is empty



* Fri Jan 10 2006 Joerg Bruehe <joerg@mysql.com>



- Use "-i" on "make test-force";