Commit 960af9f6 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new-maint 

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


configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_mgm.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 4991cc07 51e8434e

BUILD/check-cpu

+5 −1
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ check_cpu () { 
    *Opteron*)

      cpu_arg="opteron";

      ;;

    # MacOSX / Intel  

    *i386*i486*)

      cpu_arg="pentium-m";

      ;;



    # Intel ia64

    *Itanium*)
@@ -131,7 +135,7 @@ check_cpu () { 
  fi



  cc_ver=`$cc --version | sed 1q`

  cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`



  case "$cc_ver--$cc_verno" in

    *GCC*)

bdb/CMakeLists.txt

0 → 100755
+44 −0
Original line number Diff line number Diff line 
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/bdb/build_win32

                    ${CMAKE_SOURCE_DIR}/bdb/dbinc

                    ${CMAKE_SOURCE_DIR}/bdb)



# BDB needs a number of source files that are auto-generated by the unix

# configure. So to build BDB, it is necessary to copy these over to the Windows

# bitkeeper tree, or to use a source .tar.gz package which already has these

# files.

ADD_LIBRARY(bdb btree/bt_compare.c btree/bt_conv.c btree/bt_curadj.c btree/bt_cursor.c

			btree/bt_delete.c btree/bt_method.c btree/bt_open.c btree/bt_put.c btree/bt_rec.c

			btree/bt_reclaim.c btree/bt_recno.c btree/bt_rsearch.c btree/bt_search.c

			btree/bt_split.c btree/bt_stat.c btree/bt_upgrade.c btree/bt_verify.c btree/btree_auto.c

			db/crdel_auto.c db/crdel_rec.c db/db.c db/db_am.c db/db_auto.c common/db_byteorder.c

			db/db_cam.c db/db_conv.c db/db_dispatch.c db/db_dup.c common/db_err.c common/db_getlong.c

			common/db_idspace.c db/db_iface.c db/db_join.c common/db_log2.c db/db_meta.c

			db/db_method.c db/db_open.c db/db_overflow.c db/db_pr.c db/db_rec.c db/db_reclaim.c

			db/db_remove.c db/db_rename.c db/db_ret.c env/db_salloc.c env/db_shash.c db/db_truncate.c

			db/db_upg.c db/db_upg_opd.c db/db_vrfy.c db/db_vrfyutil.c dbm/dbm.c dbreg/dbreg.c

			dbreg/dbreg_auto.c dbreg/dbreg_rec.c dbreg/dbreg_util.c env/env_file.c env/env_method.c

			env/env_open.c env/env_recover.c env/env_region.c fileops/fileops_auto.c fileops/fop_basic.c

			fileops/fop_rec.c fileops/fop_util.c hash/hash.c hash/hash_auto.c hash/hash_conv.c

			hash/hash_dup.c hash/hash_func.c hash/hash_meta.c hash/hash_method.c hash/hash_open.c

			hash/hash_page.c hash/hash_rec.c  hash/hash_reclaim.c hash/hash_stat.c hash/hash_upgrade.c

			hash/hash_verify.c hmac/hmac.c hsearch/hsearch.c lock/lock.c lock/lock_deadlock.c

			lock/lock_method.c lock/lock_region.c lock/lock_stat.c lock/lock_util.c log/log.c

			log/log_archive.c log/log_compare.c log/log_get.c log/log_method.c log/log_put.c

			mp/mp_alloc.c mp/mp_bh.c mp/mp_fget.c mp/mp_fopen.c mp/mp_fput.c

			mp/mp_fset.c mp/mp_method.c mp/mp_region.c mp/mp_register.c mp/mp_stat.c mp/mp_sync.c

			mp/mp_trickle.c mutex/mut_tas.c mutex/mut_win32.c mutex/mutex.c os_win32/os_abs.c

			os/os_alloc.c os_win32/os_clock.c os_win32/os_config.c os_win32/os_dir.c os_win32/os_errno.c

			os_win32/os_fid.c os_win32/os_fsync.c os_win32/os_handle.c os/os_id.c os_win32/os_map.c

			os/os_method.c os/os_oflags.c os_win32/os_open.c os/os_region.c os_win32/os_rename.c

			os/os_root.c os/os_rpath.c os_win32/os_rw.c os_win32/os_seek.c os_win32/os_sleep.c

			os_win32/os_spin.c os_win32/os_stat.c os/os_tmpdir.c os_win32/os_type.c os/os_unlink.c

			qam/qam.c qam/qam_auto.c qam/qam_conv.c qam/qam_files.c qam/qam_method.c qam/qam_open.c

			qam/qam_rec.c qam/qam_stat.c qam/qam_upgrade.c qam/qam_verify.c rep/rep_method.c

			rep/rep_record.c rep/rep_region.c rep/rep_util.c hmac/sha1.c

			clib/strcasecmp.c txn/txn.c txn/txn_auto.c txn/txn_method.c txn/txn_rec.c

			txn/txn_recover.c txn/txn_region.c txn/txn_stat.c txn/txn_util.c common/util_log.c

			common/util_sig.c xa/xa.c xa/xa_db.c xa/xa_map.c)

client/mysql.cc

+7 −2
Original line number Diff line number Diff line
@@ -2334,7 +2334,12 @@ print_table_data(MYSQL_RES *result) 
    (void) tee_fputs("|", PAGER);

    for (uint off=0; (field = mysql_fetch_field(result)) ; off++)

    {

      tee_fprintf(PAGER, " %-*s |",(int) min(field->max_length,

      uint name_length= (uint) strlen(field->name);

      uint numcells= charset_info->cset->numcells(charset_info,

                                                  field->name,

                                                  field->name + name_length);

      uint display_length= field->max_length + name_length - numcells;

      tee_fprintf(PAGER, " %-*s |",(int) min(display_length,

                                            MAX_COLUMN_LENGTH),

                  field->name);

      num_flag[off]= IS_NUM(field->type);

client/mysqldump.c

+8 −4
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ static int get_options(int *argc, char ***argv) 
static void DB_error(MYSQL *mysql, const char *when)

{

  DBUG_ENTER("DB_error");

  my_printf_error(0,"Got error: %d: %s %s", MYF(0),

  fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname,

          mysql_errno(mysql), mysql_error(mysql), when);

  safe_exit(EX_MYSQLERR);

  DBUG_VOID_RETURN;
@@ -892,8 +892,9 @@ static int mysql_query_with_error_report(MYSQL *mysql_con, MYSQL_RES **res, 
  if (mysql_query(mysql_con, query) ||

      (res && !((*res)= mysql_store_result(mysql_con))))

  {

    my_printf_error(0, "Couldn't execute '%s': %s (%d)", MYF(0),

                    query, mysql_error(mysql_con), mysql_errno(mysql_con));

    fprintf(stderr, "%s: Couldn't execute '%s': %s (%d)\n",

            my_progname, query,

            mysql_error(mysql_con), mysql_errno(mysql_con));

    safe_exit(EX_MYSQLERR);

    return 1;

  }
@@ -2380,7 +2381,10 @@ static void dump_table(char *table, char *db) 
      check_io(md_result_file);

    }

    if (mysql_query_with_error_report(mysql, 0, query))

    {

      DB_error(mysql, "when retrieving data from server");

      goto err;

    }

    if (quick)

      res=mysql_use_result(mysql);

    else

configure.in

+9 −6
Original line number Diff line number Diff line
@@ -1530,17 +1530,20 @@ AC_ARG_WITH(debug, 
if test "$with_debug" = "yes"

then

  # Medium debug.

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS"

  AC_DEFINE([DBUG_ON], [1], [Use libdbug])

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"

elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

  AC_DEFINE([DBUG_ON], [1], [Use libdbug])

  CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"

  AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])

  CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"

  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"

fi



# If we should allow error injection tests