Commit 479f494d authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge

parents 38a4648a 075a0fbd

Docs/manual.texi

+1 −1
Original line number Diff line number Diff line
@@ -4037,7 +4037,7 @@ If you set an @code{ENUM} column to an unsupported value, it will be set to 
the error value 'empty string', with numeric value 0.















@item













If you set an @cod{SET} column to an unsupported value, the value will













If you set an @code{SET} column to an unsupported value, the value will















be ignored. @xref{Bugs}.





























@end itemize

























innobase/log/log0log.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -1857,7 +1857,7 @@ log_group_archive(













	os_file_t file_handle;















	dulint	start_lsn;















	dulint	end_lsn;













	char	name[100];













	char	name[1024];















	byte*	buf;















	ulint	len;















	ibool	ret;

































mysys/mf_sort.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -25,7 +25,7 @@ void my_string_ptr_sort(void *base, uint items, size_s size)













#if INT_MAX > 65536L















  uchar **ptr=0;





























  if (size <= 20 && items >= 1000 &&













  if (size <= 20 && items >= 1000 && items < 100000 &&















      (ptr= (uchar**) my_malloc(items*sizeof(char*),MYF(0))))















  {















    radixsort_for_str_ptr((uchar**) base,items,size,ptr);

































scripts/make_binary_distribution.sh



+4
−2






























Original line number
Diff line number
Diff line








@@ -66,10 +66,12 @@ for i in extra/comp_err extra/replace extra/perror extra/resolveip \













  myisam/myisampack sql/mysqld sql/mysqlbinlog \















  client/mysql sql/mysqld client/mysqlshow client/mysqlcheck \















  client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \













  tools/mysqlmanager \













  client/mysqlmanagerc client/mysqlmanager-pwgen tools/mysqlmanager \















  client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \















  client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest \













  client/.libs/mysqlcheck tools/.libs/mysqlmanager













  client/.libs/mysqlcheck \













  client/.libs/mysqlmanagerc client/libs/mysqlmanager-pwgen \













  tools/.libs/mysqlmanager















do















  if [ -f $i ]















  then

































sql-bench/test-insert.sh



+10
−4






























Original line number
Diff line number
Diff line








@@ -917,13 +917,19 @@ print "Time for update_with_key (" . ($opt_loop_count*3) . "):  " .













  timestr(timediff($end_time, $loop_time),"all") . "\n";































$loop_time=new Benchmark;













for ($i=0 ; $i < $opt_loop_count*3 ; $i+=3)













$count=0;













for ($i=1 ; $i < $opt_loop_count*3 ; $i+=3)















{















  $sth = $dbh->do("update bench1 set dummy1='updated' where id=$i") or die $DBI::errstr;













}





























  $end_time=new Benchmark;













print "Time for update_with_key_prefix (" . ($opt_loop_count) . "):  " .













  last if ($estimated=predict_query_time($loop_time,$end_time,\$i,$tests,













					 $opt_loop_count));













}













if ($estimated)













{ print "Estimated time"; }













else













{ print "Time"; }













print " for update_with_key_prefix (" . ($opt_loop_count) . "):  " .















  timestr(timediff($end_time, $loop_time),"all") . "\n";































print "\nTesting update of all rows\n";