fix after merge

Docs/manual.texi:
  Fix after merge
include/my_global.h:
  merge fix
mysql-test/r/create.result:
  merge fix
mysys/thr_alarm.c:
  Fix for using --debug with alarms

Docs/manual.texi

@@ -9638,12 +9638,52 @@ client/server and don't need to access the server from other hosts.
 Add some nice start and shutdown icons to the MySQL installation.
 
 @item
+When registering @code{mysqld} as a service with @code{--install} (on NT)
+it would be nice if you could also add default options on the command line.
+For the moment, the workaround is to list the parameters in the
+@file{C:\my.cnf} file instead.
 
 @item
-The CSSA-2001-SCO.35.2 (the patch is listed in custom as
-erg711905-dscr_remap security patch (ver 2.0.0) breaks FSU threads and
-makes mysqld instable.  You have to remove this one if you want to run
-mysqld on an OpenServer 5.0.6 machine.
+It would be real nice to be able to kill @code{mysqld} from the task manager.
+For the moment, you must use @code{mysqladmin shutdown}.
+
+@item
+Port @code{readline} to Windows for use in the @code{mysql} command line tool.
+
+@item
+GUI versions of the standard MySQL clients (@code{mysql},
+@code{mysqlshow}, @code{mysqladmin}, and @code{mysqldump}) would be nice.
+
+@item
+It would be nice if the socket read and write functions in @file{net.c} were
+interruptible. This would make it possible to kill open threads with
+@code{mysqladmin kill} on Windows.
+
+@item
+@code{mysqld} always starts in the "C" locale and not in the default locale.
+We would like to have @code{mysqld} use the current locale for the sort order.
+
+@item
+Add macros to use the faster thread-safe increment/decrement methods
+provided by Windows.
+@end itemize
+
+Other Windows-specific issues are described in the @file{README} file that
+comes with the MySQL-Windows distribution.
+
+
+@node Solaris, BSD Notes, Windows, Operating System Specific Notes
+@subsection Solaris Notes
+
+@cindex Solaris installation problems
+@cindex problems, installing on Solaris
+@cindex tar, problems on Solaris
+@cindex errors, directory checksum
+@cindex checksum errors
+
+On Solaris, you may run into trouble even before you get the MySQL
+distribution unpacked!  Solaris @code{tar} can't handle long file names, so
+you may see an error like this when you unpack MySQL:
 
 @example
 x mysql-3.22.12-beta/bench/Results/ATIS-mysql_odbc-NT_4.0-cmp-db2,\
@@ -10974,6 +11014,12 @@ make sure that @file{gmalloc.o} is included in @file{libgthreads.a} and
 In FSU Pthreads, the following system calls are pthreads-aware: @code{read()},
 @code{write()}, @code{getmsg()}, @code{connect()}, @code{accept()},
 @code{select()}, and @code{wait()}.
+
+@item
+The CSSA-2001-SCO.35.2 (the patch is listed in custom as
+erg711905-dscr_remap security patch (ver 2.0.0) breaks FSU threads and
+makes mysqld instable.  You have to remove this one if you want to run
+mysqld on an OpenServer 5.0.6 machine.
 @end itemize
 
 If you want to install DBI on SCO, you have to edit the @file{Makefile} in

include/my_global.h

@@ -314,6 +314,7 @@ typedef unsigned short ushort;
 #define set_if_bigger(a,b)  { if ((a) < (b)) (a)=(b); }
 #define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); }
 #define test_all_bits(a,b) (((a) & (b)) == (b))
+#define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1))
 #define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0])))
 #ifndef HAVE_RINT
 #define rint(A) floor((A)+0.5)

mysql-test/r/create.result

@@ -94,3 +94,43 @@ d	date			0000-00-00
 t	time			00:00:00	
 dt	datetime			0000-00-00 00:00:00	
 drop table t1,t2;
+create table t1 (a int not null, b int, primary key(a), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b));
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL default '0',
+  `b` int(11) default NULL,
+  PRIMARY KEY  (`a`),
+  KEY `b` (`b`),
+  KEY `b_2` (`b`),
+  KEY `b_3` (`b`),
+  KEY `b_4` (`b`),
+  KEY `b_5` (`b`),
+  KEY `b_6` (`b`),
+  KEY `b_7` (`b`),
+  KEY `b_8` (`b`),
+  KEY `b_9` (`b`),
+  KEY `b_10` (`b`),
+  KEY `b_11` (`b`),
+  KEY `b_12` (`b`),
+  KEY `b_13` (`b`),
+  KEY `b_14` (`b`),
+  KEY `b_15` (`b`),
+  KEY `b_16` (`b`),
+  KEY `b_17` (`b`),
+  KEY `b_18` (`b`),
+  KEY `b_19` (`b`),
+  KEY `b_20` (`b`),
+  KEY `b_21` (`b`),
+  KEY `b_22` (`b`),
+  KEY `b_23` (`b`),
+  KEY `b_24` (`b`),
+  KEY `b_25` (`b`),
+  KEY `b_26` (`b`),
+  KEY `b_27` (`b`),
+  KEY `b_28` (`b`),
+  KEY `b_29` (`b`),
+  KEY `b_30` (`b`),
+  KEY `b_31` (`b`)
+) TYPE=MyISAM
+drop table t1;

mysys/thr_alarm.c

@@ -14,6 +14,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/* To avoid problems with alarms in debug code, we disable DBUG here */
+#define DBUG_OFF
 #include <my_global.h>
 
 #if defined(THREAD) && !defined(DONT_USE_THR_ALARM)