Commit c90b0ab5 authored by unknown's avatar unknown
Browse files

Merge 


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Ignore 4.1 version change
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge 4.1
ndb/src/ndbapi/ClusterMgr.cpp:
  merge
ndb/test/run-test/Makefile.am:
  merge
sql/mysql_priv.h:
  merge from 4.1
sql/table.cc:
  Merge from 4.1
parents 9a71e2db 8815d6cf

BUILD/check-cpu

+17 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ else 
  esac

fi



cpu_flag=""

cpu_flag_old=""



case "$cpu_family--$model_name" in

  Alpha*EV6*)

    cpu_flag="ev6";
@@ -40,11 +43,21 @@ case "$cpu_family--$model_name" in 
  *Xeon*)

    cpu_flag="nocona";

    ;;

  *Pentium*4*Mobile*CPU*)

    cpu_flag="pentium4m";

  ;;

  *Pentium*4*CPU*)

    cpu_flag="pentium4";

    ;;

  *Pentium*III*Mobile*CPU*)

    cpu_flag="pentium3m";

  ;;

  *Pentium*III*CPU*)

    cpu_flag="pentium3";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    cpu_flag_old="athlon";

    ;;

  *Athlon*)

    cpu_flag="athlon";
@@ -84,6 +97,10 @@ case "$cc_ver--$cc_verno" in 
    check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"

    ;;

  *GCC*)

    # Fix for older compiler versions

    if test -n "$cpu_flag_old"; then

      cpu_flag="$cpu_flag_old"

    fi

    check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"

    ;;

  *)

include/my_global.h

+6 −0
Original line number Diff line number Diff line
@@ -308,9 +308,15 @@ C_MODE_END 
#ifndef CONFIG_SMP

#define CONFIG_SMP

#endif

#if defined(__ia64__)

#define new my_arg_new

#endif

C_MODE_START

#include <asm/atomic.h>

C_MODE_END

#if defined(__ia64__)

#undef new

#endif

#endif

#include <errno.h>				/* Recommended by debian */

/* We need the following to go around a problem with openssl on solaris */

mysql-test/r/ctype_utf8.result

+3 −0
Original line number Diff line number Diff line
@@ -817,6 +817,9 @@ drop table t1; 
select 'c' like '\_' as want0;

want0

0

SELECT SUBSTR('вася',-2);

SUBSTR('вася',-2)

ся

create table t1 (id integer, a varchar(100) character set utf8 collate utf8_unicode_ci);

insert into t1 values (1, 'Test');

select * from t1 where soundex(a) = soundex('Test');

mysql-test/r/select.result

+10 −0
Original line number Diff line number Diff line
@@ -2476,3 +2476,13 @@ x 
NULL

1.0000

drop table t1;

create table t1 (a int(11));

select all all * from t1;

a

select distinct distinct * from t1;

a

select all distinct * from t1;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'distinct * from t1' at line 1

select distinct all * from t1;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'all * from t1' at line 1

drop table t1;

mysql-test/t/ctype_utf8.test

+6 −0
Original line number Diff line number Diff line
@@ -666,6 +666,12 @@ drop table t1; 
#

select 'c' like '\_' as want0; 



#

# SUBSTR with negative offset didn't work with multi-byte strings

#

SELECT SUBSTR('вася',-2);





#

# Bug #7730 Server crash using soundex on an utf8 table

#