mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
This commit is contained in:
unknown
commit
2de9dc132e
3 changed files with 31 additions and 29 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#This file is automaticly generated by crash-me 1.60
|
||||
#This file is automaticly generated by crash-me 1.61
|
||||
|
||||
NEG=yes # update of column= -column
|
||||
###< create table crash_q (a integer)
|
||||
|
|
@ -177,7 +177,7 @@ compute=no # Compute
|
|||
###> execute error:You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near 'compute sum(a) by a' at line 1
|
||||
###
|
||||
###As far as some queries didnt return OK, result is NO
|
||||
connections=101 # Simultaneous connections (installation default)
|
||||
connections=99 # Simultaneous connections (installation default)
|
||||
constraint_check=syntax only # Column constraints
|
||||
###< create table crash_q (a int check (a>0))
|
||||
###> OK
|
||||
|
|
@ -213,7 +213,7 @@ constraint_null=yes # NULL constraint (SyBase style)
|
|||
###
|
||||
###As far as all queries returned OK, result is YES
|
||||
crash_me_safe=yes # crash me safe
|
||||
crash_me_version=1.60 # crash me version
|
||||
crash_me_version=1.61 # crash me version
|
||||
create_default=yes # default value for column
|
||||
###< create table crash_q (q integer default 10 not null)
|
||||
###> OK
|
||||
|
|
@ -345,7 +345,7 @@ date_format_inresult=iso # Date format in result
|
|||
###> OK
|
||||
###
|
||||
###< select a from crash_me_d
|
||||
###> 2003-02-08
|
||||
###> 2003-03-26
|
||||
###< delete from crash_me_d
|
||||
###> OK
|
||||
date_infinity=error # Supports 'infinity dates
|
||||
|
|
@ -695,7 +695,7 @@ func_extra_elt=yes # Function ELT
|
|||
func_extra_encrypt=yes # Function ENCRYPT
|
||||
###
|
||||
###<select encrypt('hello')
|
||||
###>kpb.ynRIu0Udw
|
||||
###>tJNum3fO44bOE
|
||||
func_extra_expand2arg=no # Function EXPAND
|
||||
###
|
||||
###<select expand('abcd',6)
|
||||
|
|
@ -991,7 +991,7 @@ func_extra_subtime=no # Function SUBTIME
|
|||
func_extra_sysdate=yes # Function SYSDATE
|
||||
###
|
||||
###<select sysdate()
|
||||
###>2003-02-08 00:09:52
|
||||
###>2003-03-26 13:44:57
|
||||
func_extra_tail=no # Function TAIL
|
||||
###
|
||||
###<select tail('ABCDEFG',3)
|
||||
|
|
@ -1056,7 +1056,7 @@ func_extra_uid=no # Function UID
|
|||
func_extra_unix_timestamp=yes # Function UNIX_TIMESTAMP
|
||||
###
|
||||
###<select unix_timestamp()
|
||||
###>1044655792
|
||||
###>1048679097
|
||||
func_extra_userenv=no # Function USERENV
|
||||
###
|
||||
###<select userenv
|
||||
|
|
@ -1068,7 +1068,7 @@ func_extra_value=no # Function VALUE
|
|||
func_extra_version=yes # Function VERSION
|
||||
###
|
||||
###<select version()
|
||||
###>4.0.11-gamma
|
||||
###>4.0.12-debug
|
||||
func_extra_weekday=yes # Function WEEKDAY
|
||||
###
|
||||
###<select weekday('1997-11-29') from crash_me_d
|
||||
|
|
@ -1136,11 +1136,11 @@ func_odbc_cot=yes # Function COT
|
|||
func_odbc_curdate=yes # Function CURDATE
|
||||
###
|
||||
###<select curdate()
|
||||
###>2003-02-08
|
||||
###>2003-03-26
|
||||
func_odbc_curtime=yes # Function CURTIME
|
||||
###
|
||||
###<select curtime()
|
||||
###>00:09:52
|
||||
###>13:44:57
|
||||
func_odbc_database=yes # Function DATABASE
|
||||
###
|
||||
###<select database()
|
||||
|
|
@ -1269,7 +1269,7 @@ func_odbc_monthname=yes # Function MONTHNAME
|
|||
func_odbc_now=yes # Function NOW
|
||||
###
|
||||
###<select now()
|
||||
###>2003-02-08 00:09:52
|
||||
###>2003-03-26 13:44:57
|
||||
func_odbc_pi=yes # Function PI
|
||||
###
|
||||
###<select pi()
|
||||
|
|
@ -1416,15 +1416,15 @@ func_sql_concat_as_||=error # Function concatenation with ||
|
|||
func_sql_current_date=yes # Function CURRENT_DATE
|
||||
###
|
||||
###<select current_date
|
||||
###>2003-02-08
|
||||
###>2003-03-26
|
||||
func_sql_current_time=yes # Function CURRENT_TIME
|
||||
###
|
||||
###<select current_time
|
||||
###>00:09:52
|
||||
###>13:44:57
|
||||
func_sql_current_timestamp=yes # Function CURRENT_TIMESTAMP
|
||||
###
|
||||
###<select current_timestamp
|
||||
###>2003-02-08 00:09:52
|
||||
###>2003-03-26 13:44:57
|
||||
func_sql_current_user=with_parenthesis # CURRENT_USER
|
||||
###< select CURRENT_USER
|
||||
###> execute error:Unknown column 'CURRENT_USER' in 'field list'
|
||||
|
|
@ -1438,11 +1438,11 @@ func_sql_extract_sql=yes # Function EXTRACT
|
|||
func_sql_localtime=yes # Function LOCALTIME
|
||||
###
|
||||
###<select localtime
|
||||
###>2003-02-08 00:09:52
|
||||
###>2003-03-26 13:44:57
|
||||
func_sql_localtimestamp=yes # Function LOCALTIMESTAMP
|
||||
###
|
||||
###<select localtimestamp
|
||||
###>2003-02-08 00:09:52
|
||||
###>2003-03-26 13:44:57
|
||||
func_sql_lower=yes # Function LOWER
|
||||
###
|
||||
###<select LOWER('ABC')
|
||||
|
|
@ -1880,7 +1880,7 @@ logical_value=1 # Value of logical operation (1=1)
|
|||
###>1
|
||||
max_big_expressions=10 # big expressions
|
||||
###We are trying (example with N=5):
|
||||
###select 0+(1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+...(10558)
|
||||
###select 0+(1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+...(16398)
|
||||
### 50:FAIL 10:OK 30:FAIL 14:FAIL 11:FAIL
|
||||
max_char_size=255 # max char() size
|
||||
###We are trying (example with N=5):
|
||||
|
|
@ -1902,10 +1902,10 @@ max_conditions=85660 # OR and AND in WHERE
|
|||
###We are trying (example with N=5):
|
||||
###select a from crash_me where a=1 and b='a' or a=0 and b='0' or a=1 and b='1' or a=2 and b='2' or a=3 and b='3' or a=4 and b='4'
|
||||
### 27592:OK 41389:OK 48287:FAIL 42769:OK 45528:FAIL 43321:FAIL 42880:FAIL 42791:OK 42835:FAIL 42800:OK 42817:OK 42826:OK 42830:OK 42832:FAIL 42831:FAIL
|
||||
max_expressions=1075 # simple expressions
|
||||
max_expressions=1659 # simple expressions
|
||||
###We are trying (example with N=5):
|
||||
###select 1+1+1+1+1+1
|
||||
### 5000:FAIL 1000:OK 3000:FAIL 1400:FAIL 1080:FAIL 1016:OK 1048:OK 1064:OK 1072:OK 1076:FAIL 1073:OK 1074:OK 1075:OK
|
||||
### 5000:FAIL 1000:OK 3000:FAIL 1400:OK 2200:FAIL 1560:OK 1880:FAIL 1624:OK 1752:FAIL 1650:OK 1701:FAIL 1660:FAIL 1652:OK 1656:OK 1658:OK 1659:OK
|
||||
max_index=32 # max index
|
||||
### max_unique_index=32 ,so max_index must be same
|
||||
max_index_length=500 # index length
|
||||
|
|
@ -1946,10 +1946,10 @@ max_row_length_with_null=65502 # table row length with nulls (without blobs)
|
|||
max_select_alias_name=+512 # select alias name length
|
||||
###We are trying (example with N=5):
|
||||
###select b as aaaaa from crash_me
|
||||
max_stack_expression=1075 # stacked expressions
|
||||
max_stack_expression=1659 # stacked expressions
|
||||
###We are trying (example with N=5):
|
||||
###select 1+(1+(1+(1+(1+(1)))))
|
||||
### 1000:OK 1500:FAIL 1100:FAIL 1020:OK 1060:OK 1080:FAIL 1064:OK 1072:OK 1076:FAIL 1073:OK 1074:OK 1075:OK
|
||||
### 1000:OK 1500:OK 1750:FAIL 1550:OK 1650:OK 1700:FAIL 1660:FAIL 1652:OK 1656:OK 1658:OK 1659:OK
|
||||
max_table_alias_name=+512 # table alias name length
|
||||
###We are trying (example with N=5):
|
||||
###select aaaaa.b from crash_me aaaaa
|
||||
|
|
@ -6043,7 +6043,7 @@ select_without_from=yes # SELECT without FROM
|
|||
###> OK
|
||||
###
|
||||
###As far as all queries returned OK, result is YES
|
||||
server_version=MySQL 4.0.11 gamma # server version
|
||||
server_version=MySQL 4.0.12 debug/ # server version
|
||||
simple_joins=yes # ANSI SQL simple joins
|
||||
###< select crash_me.a from crash_me, crash_me t0
|
||||
###> OK
|
||||
|
|
@ -6166,7 +6166,7 @@ time_format_inresult=iso # Time format in result
|
|||
###> OK
|
||||
###
|
||||
###< select a from crash_me_t
|
||||
###> 00:09:52
|
||||
###> 13:44:57
|
||||
###< delete from crash_me_t
|
||||
###> OK
|
||||
transactions=yes # transactions
|
||||
|
|
|
|||
|
|
@ -2102,12 +2102,14 @@ int main(int argc, char **argv)
|
|||
#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
|
||||
{
|
||||
/* Retrieve used stack size; Needed for checking stack overflows */
|
||||
size_t stack_size;
|
||||
size_t stack_size= 0;
|
||||
pthread_attr_getstacksize(&connection_attrib, &stack_size);
|
||||
if (global_system_variables.log_warnings && stack_size != thread_stack)
|
||||
/* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */
|
||||
if (stack_size && stack_size != thread_stack)
|
||||
{
|
||||
sql_print_error("Warning: Asked for %ld thread stack, but got %ld",
|
||||
thread_stack, stack_size);
|
||||
if (global_system_variables.log_warnings)
|
||||
sql_print_error("Warning: Asked for %ld thread stack, but got %ld",
|
||||
thread_stack, stack_size);
|
||||
thread_stack= stack_size;
|
||||
}
|
||||
}
|
||||
|
|
@ -3293,7 +3295,7 @@ struct my_option my_long_options[] =
|
|||
"Set to 0 (write and flush once per second), 1 (write and flush at each commit) or 2 (write at commit, flush once per second)",
|
||||
(gptr*) &innobase_flush_log_at_trx_commit,
|
||||
(gptr*) &innobase_flush_log_at_trx_commit,
|
||||
0, GET_UINT, OPT_ARG, 0, 0, 2, 0, 0, 0},
|
||||
0, GET_UINT, OPT_ARG, 1, 0, 2, 0, 0, 0},
|
||||
{"innodb_flush_method", OPT_INNODB_FLUSH_METHOD,
|
||||
"With which method to flush data", (gptr*) &innobase_unix_file_flush_method,
|
||||
(gptr*) &innobase_unix_file_flush_method, 0, GET_STR, REQUIRED_ARG, 0, 0, 0,
|
||||
|
|
|
|||
|
|
@ -1060,7 +1060,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
|
|||
thd_info->user=thd->strdup(tmp->user ? tmp->user :
|
||||
(tmp->system_thread ?
|
||||
"system user" : "unauthenticated user"));
|
||||
if (tmp->peer_port && (tmp->host || tmp->ip))
|
||||
if (tmp->peer_port && (tmp->host || tmp->ip) && thd->host_or_ip[0])
|
||||
{
|
||||
if ((thd_info->host= thd->alloc(LIST_PROCESS_HOST_LEN+1)))
|
||||
my_snprintf((char *) thd_info->host, LIST_PROCESS_HOST_LEN,
|
||||
|
|
|
|||
Loading…
Reference in a new issue