into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
client/mysqltest.c:
Prepend the command to execute by system with "sh" to make it executed by cygwin's bash
mysql-test/t/mysqldump.test:
Change from " to ' to avoid bash's filename expanding. I.e to avoid that "[mysqltest1]" will be llok for any dirs in mysql-test/* that are named m, y, s, q etc. And ther is actually one dir called t, so we will get a match and thus echo "t" to the file.
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.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
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
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
- 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
client/Makefile.am:
Use LDADD_R as common variable for programs to be linked with thread safe library.
client/mysqlimport.c:
Enable "--use-threads"
Formatting
mysql-test/r/mysqldump.result:
Update test result
mysql-test/t/disabled.def:
Enable mysqldump
mysql-test/t/mysqldump.test:
Enable test for mysqlimport with threads
Add test for failed mysqlimport
- Disable --use-threads option in 5.1.7
client/mysqlimport.c:
Disable --use-threads option
mysql-test/r/mysqldump.result:
Update test result
mysql-test/t/mysqldump.test:
Disable test for --use-threads
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
include/config-win.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/rpl_000015.test:
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
This is for bug#17384
mysql-test/r/mysqldump.result:
Changed result
mysql-test/t/disabled.def:
Re-enable after fixing bugs
mysql-test/t/mysqldump.test:
Added silent option
client/Makefile.am:
Adding client_thread_libs for mysqlimport (aka it gets pthreads)
client/client_priv.h:
New option
client/mysqlimport.c:
Reworked logic to allow someone to use threads.
mysql-test/r/mysqldump.result:
New results
mysql-test/t/mysqldump.test:
Added tests for threads.
- Pass "in_comment" variable on to new lex in sp_head::reset_lex
- Add testcases for dumping and reloading trigger without BEGIN/END
mysql-test/r/mysqldump.result:
Update test result
mysql-test/t/mysqldump.test:
Add test for dumping trigger without begin/end, and test that the output from mysqldump can be reloaded.
sql/sp_head.cc:
If already in a comment before parsing a substatement, set in_comment in the new lex as well.
This will handle cases where the comment starts before the substatement, which is common in
output from mysqldump to mask away syntax not supported by earlier versions of MySQL.
Ex:
/*!50003 CREATE TRIGGER `tr1` BEFORE INSERT ON `t1` FOR EACH ROW
set new.created=now() */;
^=== sp_head::reset_lex is called when already in comment
