Commit cbff25d0 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/d2/hf/clean/my51-clean 

into  mysql.com:/d2/hf/common/my51-common


libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_insert.cc:
  Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
parents d73b5b8e a2fc5874

BitKeeper/etc/gone

+2 −0
Original line number Diff line number Diff line
@@ -456,6 +456,8 @@ arjen@fred.bitbike.com|scripts/mysql_fix_extensions.sh|20020516001337|12363|f104 
ccarkner@nslinuxw10.bedford.progress.com|mysql-test/r/isolation.result|20010327145543|25059|4da11e109a3d93a9

ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456

fs

holyfoot/hf@mysql.com/deer.(none)|mysql-test/r/bdb_notembedded.result|20061113160642|60022|276fa5181da9a588

holyfoot/hf@mysql.com/deer.(none)|mysql-test/t/bdb_notembedded.test|20061113160642|06094|6ef2ea4713496614

jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec

jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554

jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa

config/ac-macros/plugins.m4

+2 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ 
    AC_SUBST([mysql_se_unittest_dirs])

    AC_SUBST([mysql_pg_unittest_dirs])

    AC_SUBST([condition_dependent_plugin_modules])

    AC_SUBST([condition_dependent_plugin_objects])

    AC_SUBST([condition_dependent_plugin_links])

    AC_SUBST([condition_dependent_plugin_includes])

   ])
@@ -431,6 +432,7 @@ dnl Although this is "pretty", it breaks libmysqld build 
      AC_MSG_RESULT([yes])

      m4_ifdef([$11],[

       condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp($11, [[^/]+$], [\&])"

       condition_dependent_plugin_objects="$condition_dependent_plugin_objects m4_bregexp($11, [[^/]+\.], [\&o])"

       condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11"

       condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])"

      ])

libmysqld/Makefile.am

+24 −4
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ libmysqld_a_SOURCES= 


sqlstoragesources =	$(EXTRA_libmysqld_a_SOURCES)

storagesources = @condition_dependent_plugin_modules@

storageobjects = @condition_dependent_plugin_objects@

storagesourceslinks = @condition_dependent_plugin_links@



# automake misses these
@@ -110,6 +111,24 @@ ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc 
handler.o:	handler.cc

		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<



# We need rules to compile these as no good way

# found to append fileslists that collected by configure

# to the sources list



ha_federated.o:ha_federated.cc

		$(CXXCOMPILE) $(LM_CFLAGS) -c $<



ha_heap.o:ha_heap.cc

		$(CXXCOMPILE) $(LM_CFLAGS) -c $<



ha_innodb.o:ha_innodb.cc

		$(CXXCOMPILE) $(LM_CFLAGS) -c $<



ha_myisam.o:ha_myisam.cc

		$(CXXCOMPILE) $(LM_CFLAGS) -c $<



ha_myisammrg.o:ha_myisammrg.cc

		$(CXXCOMPILE) $(LM_CFLAGS) -c $<



#

# To make it easy for the end user to use the embedded library we
@@ -121,18 +140,18 @@ handler.o: handler.cc 
# need to add the same file twice to the library, so 'sort -u' save us

# some time and spares unnecessary work.



libmysqld.a:	libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES)

libmysqld.a:	libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES) $(storageobjects)

if DARWIN_MWCC

	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u`

	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` $(storageobjects)

else

		-rm -f libmysqld.a

		if test "$(host_os)" = "netware" ; \

		then \

		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \

		  $(libmysqld_a_AR) libmysqld.a $(INC_LIB) libmysqld_int.a $(storageobjects); \

		else \

		  current_dir=`pwd`; \

		  rm -rf tmp; mkdir tmp; \

		  (for arc in ./libmysqld_int.a $(INC_LIB); do \

		  (for arc in $(INC_LIB) ./libmysqld_int.a; do \

		    arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \

		    artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \

		    for F in `$(AR) t $$arc | grep -v SYMDEF`; do \
@@ -143,6 +162,7 @@ else 
		      ls $$artmp/* | grep -v SYMDEF; \

		      continue 2; fi; done; \

		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \

		  $(AR) r libmysqld.a $(storageobjects); \

		  $(RANLIB) libmysqld.a	; \

		  rm -rf tmp; \

		fi

libmysqld/examples/test-run

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
top_builddir=../..

mysql_test_dir=$top_builddir/mysql-test

examples=$top_builddir/libmysqld/examples

mysqltest=$examples/mysqltest

mysqltest=$examples/mysqltest_embedded

datadir=$mysql_test_dir/var/master-data

test_data_dir=test

gdb=0

libmysqld/lib_sql.cc

+8 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ int init_embedded_server(int argc, char **argv, char **groups) 
    }

  }



  execute_ddl_log_recovery();

  return 0;

}
@@ -549,6 +550,7 @@ void end_embedded_server() 
{

  my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR));

  copy_arguments_ptr=0;

  release_ddl_log();

  clean_up(0);

}
@@ -586,6 +588,7 @@ void *create_embedded_thd(int client_flag) 
  thd->set_time();

  thd->init_for_queries();

  thd->client_capabilities= client_flag;

  thd->real_id= (pthread_t) thd;



  thd->db= NULL;

  thd->db_length= 0;
@@ -771,6 +774,8 @@ MYSQL_DATA *THD::alloc_new_dataset() 


static void write_eof_packet(THD *thd)

{

  if (!thd->mysql)            // bootstrap file handling

    return;

  /*

    The following test should never be true, but it's better to do it

    because if 'is_fatal_error' is set the server is not going to execute
@@ -1030,6 +1035,9 @@ void Protocol_simple::prepare_for_resend() 
  MYSQL_DATA *data= thd->cur_data;

  DBUG_ENTER("send_data");



  if (!thd->mysql)            // bootstrap file handling

    DBUG_VOID_RETURN;



  data->rows++;

  if (!(cur= (MYSQL_ROWS *)alloc_root(alloc, sizeof(MYSQL_ROWS)+(field_count + 1) * sizeof(char *))))

  {