1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
This commit is contained in:
unknown 2006-11-30 11:04:00 -07:00
commit 2803891b03
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/mysql-test-run.pl
View File

@ -63,7 +63,6 @@ use Getopt::Long;
use Sys::Hostname; use Sys::Hostname;
use IO::Socket; use IO::Socket;
use IO::Socket::INET; use IO::Socket::INET;
use Data::Dumper;
use strict; use strict;
use warnings; use warnings;

2
sql/sql_yacc.yy
View File

@ -7054,6 +7054,8 @@ load_data_lock:
Ignore this option in SP to avoid problem with query cache Ignore this option in SP to avoid problem with query cache
*/ */
if (Lex->sphead != 0) if (Lex->sphead != 0)
$$= YYTHD->update_lock_default;
else
#endif #endif
$$= TL_WRITE_CONCURRENT_INSERT; $$= TL_WRITE_CONCURRENT_INSERT;
} }