Commit 7bc532ae authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
include/mysql_h.ic:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote
include/Makefile.am:
  Manual merge
parents 75ed6f1a cb404c2d

include/Makefile.am

+10 −16
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



BUILT_SOURCES =		mysql_version.h my_config.h mysql_h.ic

BUILT_SOURCES =		mysql_version.h my_config.h abi_check

pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \

			mysql.h mysql_com.h mysql_embed.h \

		  	my_semaphore.h my_pthread.h my_no_pthread.h \
@@ -38,6 +38,8 @@ noinst_HEADERS = config-win.h config-netware.h \ 
# Remove built files and the symlinked directories

CLEANFILES =            $(BUILT_SOURCES) readline openssl



EXTRA_DIST =            mysql_h.ic



# Some include files that may be moved and patched by configure

DISTCLEANFILES =	sched.h $(CLEANFILES)
@@ -58,25 +60,17 @@ dist-hook: 
# Rules for checking that ABI has not changed

#



# Create a icheck file for mysql.h

mysql_h.ic: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \

# Create a icheck file and compare it to the reference

abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \

           my_alloc.h typelib.h

	@set -x; \

	if [ @ICHECK@ != no ] ; then \

	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@ mysql.h; \

	else \

	  touch $@; \

	fi;



# Compare the icheck file to the reference

check_abi: mysql_h.ic

	@set -ex; \

	if [ @ICHECK@ != no ] ; then \

	  @ICHECK@ --compare mysql_h.ic mysql_h_abi.ic; \

	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \

	  @ICHECK@ --compare mysql_h.ic $@.ic; \

	fi; \

	touch check_abi;

	touch abi_check;



#all: check_abi

#all: abi_check





# Don't update the files from bitkeeper

include/mysql_h_abi.ic→include/mysql_h.ic

+0 −0

File moved.

View file

mysql-test/lib/mtr_misc.pl

+21 −20
Original line number Diff line number Diff line
@@ -66,9 +66,10 @@ sub mtr_add_arg ($$@) { 


##############################################################################



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_path_exists (@) {

  foreach my $path ( @_ )

  {
@@ -84,9 +85,11 @@ sub mtr_path_exists (@) { 
  }

}



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_script_exists (@) {

  foreach my $path ( @_ )

  {
@@ -109,17 +112,11 @@ sub mtr_script_exists (@) { 
  }

}



sub mtr_file_exists (@) {

  foreach my $path ( @_ )

  {

    return $path if -e $path;

  }

  return "";

}



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_file_exists (@) {

  foreach my $path ( @_ )

  {
@@ -128,9 +125,11 @@ sub mtr_file_exists (@) { 
  return "";

}



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_exe_maybe_exists (@) {

  my @path= @_;
@@ -149,9 +148,11 @@ sub mtr_exe_maybe_exists (@) { 
  return "";

}



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_exe_exists (@) {

  my @path= @_;

  if (my $path= mtr_exe_maybe_exists(@path))

mysql-test/mysql-test-run.pl

+6 −9
Original line number Diff line number Diff line
@@ -670,7 +670,8 @@ sub command_line_setup () { 
  $path_client_bindir= mtr_path_exists(vs_config_dirs('client', ''),

				       "$glob_basedir/client_release",

				       "$glob_basedir/client_debug",

				       "$glob_basedir/client");

				       "$glob_basedir/client",

				       "$glob_basedir/bin");



  $exe_mysqld=         mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),

				       "$glob_basedir/sql/mysqld",
@@ -1615,18 +1616,14 @@ sub environment_setup () { 
  $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};

  $ENV{'MYSQL_TCP_PORT'}=     $mysqld_variables{'port'};



  $ENV{'EXE_MYSQL'}=          $exe_mysql;

  $ENV{'IM_DEFAULTS_PATH'}=   $instance_manager->{defaults_file};

  $ENV{'IM_PASSWORD_PATH'}=   $instance_manager->{password_file};

  $ENV{'IM_PATH_SOCK'}=       $instance_manager->{path_sock};

  $ENV{'IM_USERNAME'}=        $instance_manager->{admin_login};

  $ENV{'IM_PASSWORD'}=        $instance_manager->{admin_password};

  $ENV{MTR_BUILD_THREAD}= 0 unless $ENV{MTR_BUILD_THREAD}; # Set if not set



  $ENV{'EXE_MYSQL'}=          $exe_mysql;





# ----------------------------------------------------

# Setup env so childs can execute mysqlcheck

# ----------------------------------------------------

  # ----------------------------------------------------

  # Setup env for NDB

  # ----------------------------------------------------

mysql-test/r/mysql.result

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ The commands reported in the bug report 
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)

ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)

Too long dbname

ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'

ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'

Too long hostname

ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)

End of 5.0 tests