Commit 2803891b authored by unknown's avatar unknown
Browse files

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
parents 050ec8aa 4ec84721

mysql-test/mysql-test-run.pl

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ use Getopt::Long; 
use Sys::Hostname;

use IO::Socket;

use IO::Socket::INET;

use Data::Dumper;

use strict;

use warnings;

sql/sql_yacc.yy

+2 −0
Original line number Diff line number Diff line
@@ -7054,6 +7054,8 @@ load_data_lock: 
              Ignore this option in SP to avoid problem with query cache

            */

            if (Lex->sphead != 0)

              $$= YYTHD->update_lock_default;

            else

#endif

              $$= TL_WRITE_CONCURRENT_INSERT;

          }