be the same. (Bug #11203)
mysql-test/r/loaddata.result:
Update results
mysql-test/t/loaddata.test:
Add new test
sql/sql_load.cc:
Handle having escape_char and enclosed_char the same when loading
data.
mysql-test/std_data/loaddata5.dat:
New BitKeeper file ``mysql-test/std_data/loaddata5.dat''
mysql-test/r/key.result:
Add new results
mysql-test/t/key.test:
Add new regression test
sql/table.cc:
Use keyinfo->key_parts to determine if key is part of a
multiple-field key or is unique.
mysql-test/t/mysqldump.test:
Once again. This change should not be here. Every time mysqldump.test has been edited in two different clones this problem appears.
client/mysqldump.c:
Fix progname of mysqldump
mysql-test/r/mysqldump.result:
Update test results
mysql-test/t/mysqldump.test:
Update tests, no need for results
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
Correct test results now when error message output is predictable.
client/mysqldump.c:
Set mysqldump as progname instead of totally long and strange path provided by libtool.
mysql-test/r/mysqldump.result:
Update test results
mysql-test/t/mysqldump.test:
Update test result, removed --replace now ehn test output is predictable.
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
storage/innobase/btr/btr0cur.c:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/include/rem0rec.h:
Auto merged
storage/innobase/include/rem0rec.ic:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/page/page0page.c:
Auto merged
storage/innobase/row/row0ins.c:
Auto merged
storage/innobase/trx/trx0rec.c:
Auto merged
storage/ndb/src/common/util/version.c:
Auto merged
sql/sql_insert.cc:
Auto merged
- Check the Dflag variable inside of function dump_table to see if data should be
dumped or not.
- Add test for --xml and --no-data as well
Reapplying patch!
client/mysqldump.c:
Move the check of --no-data flag and "number of fields" inside of the dump_table
function.
mysql-test/r/mysqldump.result:
Update test results add ouput for --xml and --no-data
mysql-test/t/mysqldump.test:
Add tests for XML and --no-data as well.
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
client/mysqldump.c:
Merge from 4.1 to 5.0
mysql-test/r/ndb_autodiscover.result:
Merge
ndb/test/ndbapi/create_tab.cpp:
Merge
sql/ha_ndbcluster.cc:
Merge
sql/handler.cc:
Merge
sql/handler.h:
Merge
sql/sql_base.cc:
Merge
sql/sql_table.cc:
Merge
Remove changes made by bug fix#8147. They strips list of insert_table_list to
only insert table, which results in error reported in bug #9728.
Added flag to Item to resolve ambigous fields reported in bug #8147.
sql/item.h:
Fix bug#9728 decreased functionality in "on duplicate key update".
sql/item.cc:
Fix bug#9728 decreased functionality in "on duplicate key update"
sql/sql_parse.cc:
Fix bug#9728 decreased functionality in "on duplicate key update"
sql/sql_base.cc:
Fix bug#9728 decreased functionality in "on duplicate key update".
sql/sql_yacc.yy:
Fix bug#9728 decreased functionality in "on duplicate key update"
mysql-test/t/insert_select.test:
Test case for bug#9728 Decreased functionality in "on duplicate key update".
mysql-test/r/insert_select.result:
Test case for bug#9728 Decreased functionality in "on duplicate key update".
into moonbone.local:/work/mysql-5.0-bug-11298
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
mysql-test/r/view.result:
SCCS merged
mysql-test/t/view.test:
SCCS merged
when using ORDER BY
Insert were inserting data from last record fetched instead of inserting from
temporary table.
Make Item_ref to save data from result_field if it's available rather then
from *ref on save_in_field() call.
sql/item.h:
Fix bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
sql/item.cc:
Fix bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
mysql-test/r/view.result:
Test case for bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
mysql-test/t/view.test:
Test case for bug#11298 insert into select from VIEW produces incorrect result when using ORDER BY
mysql-test/r/sp.result:
test commented until bug#11394 fix
test for bug#10136
mysql-test/t/sp.test:
test commented until bug#11394 fix
bug10136
sql/sp_head.cc:
fixed items cleunup for SP
mysql-test/r/rpl_multi_update3.result:
Changes from code review
mysql-test/t/rpl_multi_update3.test:
Changes from code review
sql/sql_parse.cc:
Changes from code review
Added optional paths for finding mysqld on Windows
Added language/charset options to embedded mysql_client_test
mysql-test/mysql-test-run.pl:
Added optional paths for finding mysqld on Windows
Added language/charset options to embedded mysql_client_test
