Commit a7bc87b3 authored by Kristofer Pettersson's avatar Kristofer Pettersson
Browse files

Automerge

parents 58a4beef 66e14f22

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -2714,6 +2714,9 @@ then 
  sql_server="vio sql"

fi



# "innochecksum" is not in the "innobase/" subdirectory, but should be switched

AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innobase" = Xyes])



# IMPORTANT - do not modify LIBS past this line - this hack is the only way

# I know to add the static NSS magic if we have static NSS libraries with

# glibc - Sasha

extra/Makefile.am

+6 −1
Original line number Diff line number Diff line
@@ -43,7 +43,12 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h 
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h



bin_PROGRAMS =		replace perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid innochecksum

			resolve_stack_dump mysql_waitpid 

# "innochecksum" should be switched

if BUILD_INNODB_TOOLS

bin_PROGRAMS += innochecksum

endif



noinst_PROGRAMS =	charset2html

EXTRA_PROGRAMS =	comp_err

EXTRA_DIST =		CMakeLists.txt

man/Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -21,5 +21,9 @@ man1_MANS = @man1_files@ 
man8_MANS =   @man8_files@

EXTRA_DIST =  $(man1_MANS) $(man8_MANS)



# "make_win_*" are not needed in Unix binary packages,

install-data-hook:

	rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*



# Don't update the files from bitkeeper

%::SCCS/s.%

mysql-test/r/ctype_ucs.result

+11 −0
Original line number Diff line number Diff line
@@ -1098,6 +1098,17 @@ ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_gen 
select * from t1 where a=if(b<10,_ucs2 0x0062,_ucs2 0x00C0);

ERROR HY000: Illegal mix of collations (ascii_general_ci,IMPLICIT) and (ucs2_general_ci,COERCIBLE) for operation '='

drop table t1;

CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET UCS2);

INSERT INTO t1 VALUES ('a');

SET @@sql_mode=pad_char_to_full_length;

SELECT HEX(s1) FROM t1;

HEX(s1)

00610020002000200020

SET @@sql_mode=default;

SELECT HEX(s1) FROM t1;

HEX(s1)

0061

DROP TABLE t1;

set collation_connection=ucs2_general_ci;

drop table if exists t1;

create table t1 as

mysql-test/r/mysqldump.result

+6 −0
Original line number Diff line number Diff line 
Bug#37938 - Test "mysqldump" lacks various insert statements

Turn off concurrent inserts to avoid random errors

NOTE:  We reset the variable back to saved value at the end of test

SET @OLD_CONCURRENT_INSERT = @@GLOBAL.CONCURRENT_INSERT;

SET @@GLOBAL.CONCURRENT_INSERT = 0;

DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;

drop database if exists mysqldump_test_db;

drop database if exists db1;
@@ -4089,6 +4094,7 @@ DROP DATABASE mysqldump_test_db; 


# -- End of test case for Bug#32538.



SET @@GLOBAL.CONCURRENT_INSERT = @OLD_CONCURRENT_INSERT;

#

# End of 5.1 tests

#