diff options
| author | unknown <pem@mysql.com> | 2003-04-16 23:23:23 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-04-16 23:23:23 +0200 |
| commit | 36752387c1f0d5e6657094057a818942383aa0a0 (patch) | |
| tree | d3271278f467f9e28c64cdd1d735e7f850b5df5e /mysql-test/r/sp-error.result | |
| parent | cfd69393e4195e55412778a9d60c7eb99c87de4c (diff) | |
| parent | df5ff1daeae5b07019afe4a0e820984d069071a6 (diff) | |
| download | mariadb-git-36752387c1f0d5e6657094057a818942383aa0a0.tar.gz | |
Merged 4.1 into 5.0.
client/mysql.cc:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/r/sp-error.result')
0 files changed, 0 insertions, 0 deletions