into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item.cc:
Auto merged
sql/sp_head.cc:
Auto merged
mysql-test/t/mysqldump.test:
Merge with my own merge
mysql-test/t/mysqltest.test:
Merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/sp.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/mysql-test-run.pl:
Merge locationwhere to search for client bins
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/mysqltest.test:
Merge
client/mysqltest.c:
Add new parameter to 'do_eval' that will add any escape chars found in the input string to the output string.
This is used in 'do_system' and in 'do_exec' where only unescaped variables
will be expanded, rest of the string will be left untouched.
mysql-test/r/mysqltest.result:
Update test result
mysql-test/t/mysqldump.test:
Revert previous patch that added extra \\ in "exec" command
mysql-test/t/mysqltest.test:
Revert previous patch that added extra \\ in exec command
Updated with echos for the results file requested by lars
mysql-test/t/rpl_row_mysqlbinlog.test:
Updated with echos for the results file requested by lars
mysql-test/r/rpl_row_mysqlbinlog.result:
Updated with echos for the results file requested by lars
mysql-test/t/rpl_row_mysqlbinlog.test:
New mysqlbinlog test for row based binlogs per lars request for WL#2321
mysql-test/t/rpl_row_mysqlbinlog-master.opt:
New mysqlbinlog test for row based binlogs per lars request for WL#2321
mysql-test/r/rpl_row_mysqlbinlog.result:
New mysqlbinlog result WL#2321
We changed the error message to more clearly reflect the fact
that we are counting parts and subparts
mysql-test/r/partition_mgm_err.result:
updated error message
sql/share/errmsg.txt:
updated error message
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Manual merge
sql/sql_base.cc:
Manual merge.
The problem was that error flag was not reset.
mysql-test/r/sp-security.result:
Results for test case for BUG#7787.
mysql-test/t/sp-security.test:
A test case for BUG#7787.
sql/sp.cc:
Reset errors after sp_find_routine().
Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to
separate stm/row test cases, the .opt were not moved along with it,
causing a 60-second test duration because of default lock timeout :-(
mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
bk cp mysql-test/t/mix_innodb_myisam_binlog-master.opt mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
Rename: mysql-test/t/mix_innodb_myisam_binlog-master.opt -> mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
mysql-test/r/mysqlbinlog_base64.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_load.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_LD_INFILE.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata2.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata_m.result:
Fix test cases to work with non-standard --vardir.
mysql-test/t/loaddata.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/mysqlbinlog_base64.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_dd_dump.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_load.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_LD_INFILE.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata2.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata_m.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loadfile.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_001.test:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_load_table_from_master.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loadfile.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_row_001.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_001.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_loaddata_m.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_stop_middle_update.result:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_drop_db.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_load_table_from_master.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_stop_middle_update.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_blob.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_func003.test:
Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
Fix test cases to work with non-standard --vardir.
mysql-test/include/ndb_backup.inc:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_bank.result:
Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_sync.result:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_bank.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_sync.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_NOW.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_func002.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp001.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp011.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig001.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig003.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_sp004.test:
Fix test cases to work with non-standard --vardir.
mysql-test/t/show_check.test:
Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_1.inc:
Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_layout.inc:
Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_dd_backuprestore.result:
Fix test cases to work with non-standard --vardir.
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
libmysqld/Makefile.am:
changed name to partition_info.cc
mysql-test/r/partition_mgm_err.result:
added drop table for previous test
mysql-test/t/partition_mgm_err.test:
added drop table for previous test
sql/Makefile.am:
reformatted a bit
changed name of partition_info.cpp to partition_info.cc
sql/partition_element.h:
updated copyright date
sql/partition_info.cc:
minor corrections as a result of review
sql/partition_info.h:
updated copyright date
sql/sql_partition.cc:
updated file comment and fixed some spacing
sql/sql_partition.h:
updated copyright date
win/cmakefiles/sql:
changed name to partition_info.cc
into linux.site:/home/reggie/work/mysql-5.1-bug15408
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_show.cc:
Auto merged
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
sql/sp_head.cc:
Auto merged
mysql-test/r/mysqldump.result:
Merge
mysql-test/t/mysqldump.test:
Merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
sql/sp_head.cc:
Auto merged
mysql-test/r/mysqldump.result:
Merge
mysql-test/t/mysqldump.test:
Merge
into neptunus.(none):/home/msvensson/mysql/bug16878/my51-bug16878
sql/sp_head.cc:
Auto merged
mysql-test/r/mysqldump.result:
Merge
mysql-test/t/mysqldump.test:
Merge
- Use "system" to execute rm, mkdir etc
- Use MYSQLTEST_VARDIR
mysql-test/t/partition_mgm_err.test:
Use system to execute "unix" command.
Use MYSQLTEST_VARDIR
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Merge
mysql-test/t/mysqldump.test:
Merge
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
into neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Merge
mysql-test/t/mysqldump.test:
Merge
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Merge
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
client/mysqldump.c:
Use information_schema.views to gather information about the view, then replace some parts of the output from "SHOW CREATE VIEW" with comment markers with version, to make thos parts of the view syntax become parsed only of MySQL servers that supports it.
Create common function "open_sql_file_for_table" to open the individual .sql file where to dump the table or view.
mysql-test/r/mysqldump.result:
Update results
mysql-test/t/mysqldump.test:
Add test to see that views can be deumped and reloaded alos when they contain "SECURITY TYPE", "CHECK OPTION" and "DEFINER"
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
client/mysqltest.c:
Merge
mysql-test/mysql-test-run.pl:
Merge
mysql-test/t/mysqldump.test:
Merge
mysql-test/t/mysqltest.test:
Merge
