diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-12-18 11:07:08 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-12-18 11:07:08 +0200 |
| commit | 82e026c1462dc2b5971bb83efffa5a82492dc1e7 (patch) | |
| tree | cb036e8ee3dacc88a815cab2435a05809623ee7b /mysql-test/r/sp-threads.result | |
| parent | 8aac47e2ccf70471c0296a32fa6aa433081c6984 (diff) | |
| parent | 55d284d424c954888536f615731a61d039d80ac1 (diff) | |
| download | mariadb-git-82e026c1462dc2b5971bb83efffa5a82492dc1e7.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B19390-5.1-opt
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/suite/rpl/r/rpl_trigger.result:
Auto merged
mysql-test/suite/rpl/t/rpl_trigger.test:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/unireg.cc:
Auto merged
mysql-test/r/union.result:
Merged bug 27848 to 5.1-opt
mysql-test/t/union.test:
Merged bug 27848 to 5.1-opt
sql/sql_yacc.yy:
Merged bug 27848 to 5.1-opt
Diffstat (limited to 'mysql-test/r/sp-threads.result')
0 files changed, 0 insertions, 0 deletions