List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:May 6 2011 9:23am
Subject:bzr push into mysql-trunk branch (magnus.blaudd:3373 to 3375)
View as plain text  
 3375 Magnus Blåudd	2011-05-06
      Merge from 5.5 to trunk

    modified:
      BUILD/SETUP.sh
 3374 Magnus Bl  modified:
      sql/sql_partition.cc
 3373 Nirbhay Choubey	2011-05-06
      Bug#11760134 - 52515: mysql sessions are not
                     terminated properly.
      
      The mysql command line client was not reacting on
      closing its controlling terminal.
      
      Added windows specific code to handle the console events.
      Added a handler for the SIGHUP to gracefully shutdown the
      running statement. Made sure the windows specific code
      handles correctly Ctrl-C.
     @ client/mysql.cc
        Bug#11760134 - 52515: mysql sessions are not
                       terminated properly.
        
        Added windows specific code to handle different
        console events.

    modified:
      client/mysql.cc*
=== modified file 'BUILD/SETUP.sh'
--- a/BUILD/SETUP.sh	2011-01-21 16:14:47 +0000
+++ b/BUILD/SETUP.sh	2011-05-06 09:23:43 +0000
@@ -31,6 +31,7 @@ Usage: $0 [-h|-n] [configure-options]
   -h, --help              Show this help message.
   -n, --just-print        Don't actually run any commands; just print them.
   -c, --just-configure    Stop after running configure.
+  --with-debug=full       Build with full debug(no optimizations, keep call stack).
   --warning-mode=[old|pedantic|maintainer]
                           Influences the debug flags. Old is default.
   --prefix=path           Build with prefix 'path'.
@@ -46,6 +47,8 @@ parse_options()
     case "$1" in
     --prefix=*)
       prefix=`get_key_value "$1"`;;
+    --with-debug=full)
+      full_debug="=full";;
     --warning-mode=*)
       warning_mode=`get_key_value "$1"`;;
     -c | --just-configure)
@@ -76,6 +79,7 @@ just_print=
 just_configure=
 warning_mode=
 maintainer_mode=
+full_debug=
 
 parse_options "$@"
 
@@ -154,7 +158,11 @@ base_cxxflags="-felide-constructors -fno
 fast_cflags="-O3 -fno-omit-frame-pointer"
 
 debug_configs="--with-debug"
-debug_cflags="$debug_cflags $debug_extra_cflags"
+if [ -z "$full_debug" ]
+then
+  debug_cflags="$debug_cflags $debug_extra_cflags"
+fi
+
 
 #
 # Configuration options.

=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2011-03-11 09:35:38 +0000
+++ b/sql/sql_partition.cc	2011-05-06 08:54:53 +0000
@@ -4051,7 +4051,7 @@ void get_partition_set(const TABLE *tabl
   part_spec->start_part= 0;
   part_spec->end_part= num_parts - 1;
   if ((index < MAX_KEY) && 
-       key_spec->flag == (uint)HA_READ_KEY_EXACT &&
+       key_spec && key_spec->flag == (uint)HA_READ_KEY_EXACT &&
        part_info->some_fields_in_PF.is_set(index))
   {
     key_info= table->key_info+index;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (magnus.blaudd:3373 to 3375) Magnus Blåudd6 May