Commit 3200d66f authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1


innobase/dict/dict0load.c:
  Auto merged
parents 94839ddf 2ddf5682

client/mysqlcheck.c

+5 −0
Original line number Diff line number Diff line
@@ -81,8 +81,13 @@ static struct my_option my_long_options[] = 
   "To check several databases. Note the difference in usage; In this case no tables are given. All name arguments are regarded as databasenames.",

   (gptr*) &opt_databases, (gptr*) &opt_databases, 0, GET_BOOL, NO_ARG,

   0, 0, 0, 0, 0, 0},

#ifdef DBUG_OFF

  {"debug", '#', "This is a non-debug version. Catch this and exit.",

   0, 0, 0, GET_DISABLED, OPT_ARG, 0, 0, 0, 0, 0, 0},

#else

  {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",

   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"default-character-set", OPT_DEFAULT_CHARSET,

   "Set the default character set.", (gptr*) &default_charset,

   (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

innobase/dict/dict0load.c

+14 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Created 4/24/1996 Heikki Tuuri 
#include "dict0boot.h"

#include "rem0cmp.h"

#include "srv0start.h"

#include "srv0srv.h"



/************************************************************************

Finds the first table name in the given database. */
@@ -124,6 +125,13 @@ dict_print(void) 
	ulint		len;

	mtr_t		mtr;

	

	/* Enlarge the fatal semaphore wait timeout during the InnoDB table

	monitor printout */



	mutex_enter(&kernel_mutex);

	srv_fatal_semaphore_wait_threshold += 7200; /* 2 hours */

	mutex_exit(&kernel_mutex);



	mutex_enter(&(dict_sys->mutex));



	mtr_start(&mtr);
@@ -146,6 +154,12 @@ dict_print(void) 
		

		mutex_exit(&(dict_sys->mutex));



		/* Restore the fatal semaphore wait timeout */



		mutex_enter(&kernel_mutex);

		srv_fatal_semaphore_wait_threshold -= 7200; /* 2 hours */

		mutex_exit(&kernel_mutex);



		return;

	}

myisam/myisamchk.c

+6 −2
Original line number Diff line number Diff line
@@ -354,8 +354,12 @@ static void usage(void) 
  puts("Description, check and repair of MyISAM tables.");

  puts("Used without options all tables on the command will be checked for errors");

  printf("Usage: %s [OPTIONS] tables[.MYI]\n", my_progname_short);

  printf("\nGlobal options:\n\

  -#, --debug=...     Output debug log. Often this is 'd:t:o,filename'.\n\

  printf("\nGlobal options:\n");

#ifndef DBUG_OFF

  printf("\

  -#, --debug=...     Output debug log. Often this is 'd:t:o,filename'.\n");

#endif

  printf("\

  -?, --help          Display this help and exit.\n\

  -O, --set-variable var=option.\n\

                      Change the value of a variable. Please note that\n\

mysql-test/r/ctype_recoding.result

+54 −0
Original line number Diff line number Diff line
@@ -186,3 +186,57 @@ select * from t1 where a=_latin1' 
ERROR HY000: Illegal mix of collations (cp1251_general_ci,IMPLICIT) and (latin1_swedish_ci,COERCIBLE) for operation '='

drop table t1;

set names latin1;

set names koi8r;

create table t1 (c1 char(10) character set cp1251);

insert into t1 values ('');

select c1 from t1 where c1 between '' and '';

c1



select ifnull(c1,''), ifnull(null,c1) from t1;

ifnull(c1,'')	ifnull(null,c1)

	

select if(1,c1,''), if(0,c1,'') from t1;

if(1,c1,'')	if(0,c1,'')

	

select coalesce('',c1), coalesce(null,c1) from t1;

coalesce('',c1)	coalesce(null,c1)

	

select least(c1,''), greatest(c1,'') from t1;

least(c1,'')	greatest(c1,'')

	

select locate(c1,''), locate('',c1) from t1;

locate(c1,'')	locate('',c1)

1	1

select field(c1,''),field('',c1) from t1;

field(c1,'')	field('',c1)

1	1

select concat(c1,''), concat('',c1) from t1;

concat(c1,'')	concat('',c1)

	

select concat_ws(c1,'',''), concat_ws('',c1,'') from t1;

concat_ws(c1,'','')	concat_ws('',c1,'')

	

select replace(c1,'',''), replace('',c1,'') from t1;

replace(c1,'','')	replace('',c1,'')

	

select substring_index(c1,'',2) from t1;

substring_index(c1,'',2)



select elt(1,c1,''),elt(1,'',c1) from t1;

elt(1,c1,'')	elt(1,'',c1)

	

select make_set(3,c1,''), make_set(3,'',c1) from t1;

make_set(3,c1,'')	make_set(3,'',c1)

,	,

select insert(c1,1,2,''),insert('',1,2,c1) from t1;

insert(c1,1,2,'')	insert('',1,2,c1)

	

select trim(c1 from ''),trim('' from c1) from t1;

trim(c1 from '')	trim('' from c1)

	

select lpad(c1,3,''), lpad('',3,c1) from t1;

lpad(c1,3,'')	lpad('',3,c1)

	

select rpad(c1,3,''), rpad('',3,c1) from t1;

rpad(c1,3,'')	rpad('',3,c1)

mysql-test/r/ps_10nestset.result

+11 −0
Original line number Diff line number Diff line
@@ -62,4 +62,15 @@ id emp salary l r 
4	Donna	1064.80	5	6

5	Eddie	931.70	7	8

6	Fred	798.60	9	10

prepare st_round from 'update t1 set salary = salary + ? - ( salary MOD ? )';

set @arg_round= 50;

execute st_round using @arg_round, @arg_round;

select * from t1;

id	emp	salary	l	r

1	Jerry	1350.00	1	12

2	Bert	1200.00	2	3

3	Chuck	1250.00	4	11

4	Donna	1100.00	5	6

5	Eddie	950.00	7	8

6	Fred	800.00	9	10

drop table t1;