Commit effd72a9 authored by unknown's avatar unknown
Browse files

Merge zim.(none):/home/ian/workspace/mysql-5.0 

into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian


BitKeeper/etc/ignore:
  auto-union
include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Changing message to add in bug numnber
parents 9c9e0684 4faee665

.bzrignore

+10 −7
Original line number Diff line number Diff line
@@ -683,18 +683,24 @@ mysql-test/r/*.out 
mysql-test/r/*.reject

mysql-test/r/alter_table.err

mysql-test/r/archive.err

mysql-test/r/backup.log

mysql-test/r/bdb-alter-table-1.err

mysql-test/r/bdb-alter-table-2.err

mysql-test/r/bdb-crash.err

mysql-test/r/bdb-deadlock.err

mysql-test/r/bdb.err

mysql-test/r/bdb.log

mysql-test/r/bdb_cache.err

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

mysql-test/r/derived.err

mysql-test/r/events.log

mysql-test/r/events_bugs.log

mysql-test/r/events_logs_tests.log

mysql-test/r/exampledb.err

mysql-test/r/func_encrypt.err

mysql-test/r/im_client_port.log

mysql-test/r/index_merge_load.result

mysql-test/r/isam.err

mysql-test/r/lowercase_table2.err
@@ -704,6 +710,7 @@ mysql-test/r/mysqlbinlog.err 
mysql-test/r/mysqlbinlog2.err

mysql-test/r/mysqldump.err

mysql-test/r/mysqltest.err

mysql-test/r/mysqltest.log

mysql-test/r/ndb_alter_table.err

mysql-test/r/ndb_autodiscover.err

mysql-test/r/ndb_autodiscover2.err
@@ -743,6 +750,9 @@ mysql-test/r/rpl000016.eval 
mysql-test/r/rpl_log.eval

mysql-test/r/slave-running.eval

mysql-test/r/slave-stopped.eval

mysql-test/r/symlink.log

mysql-test/r/system_mysql_db.log

mysql-test/r/udf.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/t/index_merge.load
@@ -1748,10 +1758,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
mysql-test/r/backup.log

mysql-test/r/events.log

mysql-test/r/events_bugs.log

mysql-test/r/events_logs_tests.log

mysql-test/r/mysqltest.log

mysql-test/r/symlink.log

mysql-test/r/system_mysql_db.log

client/mysql.cc

+9 −2
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static struct my_option my_long_options[] = 
   "Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name, 

   0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"socket", 'S', "Socket file to use for connection.",

  {"socket", 'S', "Socket file to use for connection. (This will override --port unless --protocol=TCP is specified.)",

   (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR_ALLOC,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#include "sslopt-longopts.h"
@@ -940,6 +940,13 @@ static int get_options(int argc, char **argv) 
    connect_flag= 0; /* Not in interactive mode */

  }



  if (opt_mysql_port && (!opt_protocol) && (!opt_mysql_unix_port))

  {

    /* Not checking return type since we are using a constant value */

    /* straight from the initialization of sql_protocol_typelib.    */

    opt_protocol= find_type("TCP", &sql_protocol_typelib, 0);

  }



  if (strcmp(default_charset, charset_info->csname) &&

      !(charset_info= get_charset_by_csname(default_charset, 

					    MY_CS_PRIMARY, MYF(MY_WME))))

include/mysql.h

+2 −0
Original line number Diff line number Diff line
@@ -287,8 +287,10 @@ typedef struct st_mysql 
    from mysql_stmt_close if close had to cancel result set of this object.

  */

  my_bool *unbuffered_fetch_owner;

#if defined(EMBEDDED_LIBRARY) || defined(EMBEDDED_LIBRARY_COMPATIBLE) || MYSQL_VERSION_ID >= 50100

  /* needed for embedded server - no net buffer to store the 'info' */

  char *info_buffer;

#endif

} MYSQL;



typedef struct st_mysql_res {

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -42,4 +42,4 @@ rpl_sp : Bug#16456 
rpl_until               : Unstable test case, bug#15886

sp-goto                 : GOTO is currently is disabled - will be fixed in the future

mysqldump               : BUG#18078

udf			: Need to check if udf_example.so has been built
 
udf             : Bug#18564 (Permission by Brian)

scripts/mysql_config.sh

+20 −9
Original line number Diff line number Diff line
@@ -92,17 +92,14 @@ port='@MYSQL_TCP_PORT@' 
ldflags='@LDFLAGS@'



# Create options 



# We intentionally add a space to the beginning of lib strings, simplifies replace later

libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"

libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@"

libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`



libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@"

libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@"



cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!

include="-I$pkgincludedir"

embedded_libs="$ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@"

embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`



# Remove some options that a client doesn't have to care about

# FIXME until we have a --cxxflags, we need to remove -Xa
@@ -110,7 +107,7 @@ embedded_libs=`echo "$embedded_libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | 
for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \

              DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \

              DEXTRA_DEBUG DHAVE_purify 'O[0-9]' 'W[-A-Za-z]*' \

              Xa xstrconst

              Xa xstrconst "xc99=none"

do

  # The first option we might strip will always have a space before it because

  # we set -I$pkgincludedir as the first option
@@ -118,6 +115,20 @@ do 
done

cflags=`echo "$cflags"|sed -e 's/ *\$//'` 



# Same for --libs(_r)

for remove in lmtmalloc

do

  # We know the strings starts with a space

  libs=`echo "$libs"|sed -e "s/ -$remove  */ /g"` 

  libs_r=`echo "$libs_r"|sed -e "s/ -$remove  */ /g"` 

  embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove  */ /g"` 

done



# Strip trailing and ending space if any, and '+' (FIXME why?)

libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`



usage () {

        cat <<EOF

Usage: $0 [OPTIONS]