mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 07:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge with 5.3

Browse source 
sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup
This commit is contained in:
Sergei Golubchik 2011-10-19 21:45:18 +02:00
commit 76f0b94bb0
1705 changed files with 166479 additions and 39785 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql-bench/compare-results.sh
View file

@ -512,7 +512,7 @@ sub print_value
else
{
$first=1 if ($first == 0); # Assume that it took one second instead of 0
$tmp= sprintf("%.2f",$value/$first);
$tmp= sprintf("%.3f",$value/$first);
}
if (defined($flags))
{

11
sql-bench/server-cfg.sh
View file

@ -179,11 +179,22 @@ sub new
{
$limits{'working_blobs'} = 0; # HEAP tables can't handle BLOB's
}
# HEAP is deprecated in favor of MEMORY
if (defined($main::opt_create_options) &&
$main::opt_create_options =~ /engine=memory/i)
{
$limits{'working_blobs'} = 0; # MEMORY tables can't handle BLOB's
}
if (defined($main::opt_create_options) &&
$main::opt_create_options =~ /engine=innodb/i)
{
$self->{'transactions'} = 1; # Transactions enabled
}
if (defined($main::opt_create_options) &&
$main::opt_create_options =~ /engine=pbxt/i)
{
$self->{'transactions'} = 1; # Transactions enabled
}
if (defined($main::opt_create_options) &&
$main::opt_create_options =~ /engine=ndb/i)
{

1
sql-bench/test-table-elimination.sh
View file

@ -1,3 +1,4 @@
#!@PERL@
# Test of table elimination feature