mirror of
https://github.com/MariaDB/server.git
synced 2026-05-01 04:35:32 +02:00
Merge with 4.0.11
This commit is contained in:
commit
023d6dd39b
206 changed files with 11593 additions and 65041 deletions
|
|
@ -112,7 +112,7 @@ do_many($dbh,$server->create("bench1",
|
|||
"id3 int NOT NULL",
|
||||
"dummy1 char(30)"],
|
||||
["primary key (id,id2)",
|
||||
"index index_id3 (id3)"]));
|
||||
"index ix_id3 (id3)"]));
|
||||
|
||||
if ($opt_lock_tables)
|
||||
{
|
||||
|
|
@ -1340,9 +1340,9 @@ if (($opt_fast || $opt_fast_insert) && $server->{'limits'}->{'insert_multi_value
|
|||
{
|
||||
$id= $i & 127;
|
||||
$rand=$random[$i];
|
||||
$tmp="($id,$id,$rand," . ($i & 32766) . ",'ABCDEF$rand',0,";
|
||||
$tmp="($id,$id,$rand," . ($i & 32766) . ",'ABCDEF$rand',0,$rand,$rand.0,";
|
||||
|
||||
for ($j=6; $j <= $fields ; $j++)
|
||||
for ($j=8; $j <= $fields ; $j++)
|
||||
{
|
||||
$tmp.= ($types[$j] == 0) ? "$rand," : "'$rand',";
|
||||
}
|
||||
|
|
@ -1366,9 +1366,9 @@ else
|
|||
$id= $i & 127;
|
||||
$rand=$random[$i];
|
||||
$query="insert into bench1 values ($id,$id,$rand," . ($i & 32767) .
|
||||
",'ABCDEF$rand',0,";
|
||||
",'ABCDEF$rand',0,$rand,$rand.0,";
|
||||
|
||||
for ($j=6; $j <= $fields ; $j++)
|
||||
for ($j=8; $j <= $fields ; $j++)
|
||||
{
|
||||
$query.= ($types[$j] == 0) ? "$rand," : "'$rand',";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue