Commit 4db0d3c0 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1


configure.in:
  Auto merged
parents c9208320 0c4187e0

BUILD/compile-pentium-max

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ extra_configs="$pentium_configs" 
# fail

extra_configs="$extra_configs --with-innodb --with-berkeley-db \

	--with-embedded-server --enable-thread-safe-client \

	--with-openssl --with-vio --with-raid --without-ndbcluster"

	--with-openssl --with-vio --with-raid --with-ndbcluster"



. "$path/FINISH.sh"

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -2931,7 +2931,6 @@ AC_SUBST([ndb_bin_am_ldflags]) 
AC_SUBST([ndb_opt_test_subdirs])

AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl

   ndb/src/Makefile ndb/src/common/Makefile dnl

   ndb/docs/Makefile dnl

   ndb/tools/Makefile dnl

   ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl

   ndb/src/common/portlib/Makefile dnl

include/m_ctype.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ typedef struct charset_info_st 
  uchar    *to_lower;

  uchar    *to_upper;

  uchar    *sort_order;

  uint16   *contractions;

  uint16   **sort_order_big;

  uint16      *tab_to_uni;

  MY_UNI_IDX  *tab_from_uni;

include/sql_state.h

+3 −3
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ 
  the second column is the ODBC state (which the 4.1 server sends out by

  default) and the last is the state used by the JDBC driver.

  If the last column is "" then it means that the JDBC driver is using the

  ODBC state

  ODBC state.



  The errors in this file is sorted in the same order as in mysqld_error.h

  to allow on to do binary searches for the sqlstate.

  The errors in this file are sorted in the same order as in mysqld_error.h

  to allow one to do binary searches for the sqlstate.

*/



ER_DUP_KEY,			"23000", "",

mysql-test/r/ctype_uca.result

0 → 100644
+1657 −0

File added.

Preview size limit exceeded, changes collapsed.