Merge mockturtle.local:/home/dlenev/src/mysql-5.0-cts-3
into mockturtle.local:/home/dlenev/src/mysql-5.1-cts-3 mysql-test/r/trigger.result: Auto merged mysql-test/t/trigger.test: Auto merged sql/sql_handler.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/create.result: Extended test coverage for CREATE TABLE ... SELECT is already in 5.1. mysql-test/t/create.test: Extended test coverage for CREATE TABLE ... SELECT is already in 5.1. sql/lock.cc: Using 5.1 version of lock_table_name() function. sql/mysql_priv.h: 5.1 version of mysql_priv.h already contains all needed declarations for fix for bugs #20662, #20903, #24738, #24508 sql/sql_base.cc: 5.1 version of sql_base.cc already contains all needed changes for fix for bugs #20662, #20903, #24738, #24508 sql/sql_insert.cc: 5.1 version of sql_base.cc already contains all needed changes for fix for bugs #20662, #20903, #24738, #24508 sql/sql_table.cc: 5.1 version of sql_table.cc already contains all needed changes for fix for bugs #20662, #20903, #24738, #24508 sql/sql_prepare.cc: Manual merge. sql/table.h: Manual merge.
Showing
Please register or sign in to comment