diff options
| author | unknown <monty@mysql.com> | 2005-11-23 22:58:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-23 22:58:53 +0200 |
| commit | 039168c2fa724b9ed87ce2f19a7ea20acbd8a1de (patch) | |
| tree | 8972ae3c8dffff8f3b6f27565d191af346c9ac8d /sql/share/errmsg.txt | |
| parent | fe245ed8ba1258e1f3920e449338ea92e3a3a96e (diff) | |
| parent | f631b361b6119fb73df38602ad58e140848f92d7 (diff) | |
| download | mariadb-git-039168c2fa724b9ed87ce2f19a7ea20acbd8a1de.tar.gz | |
Merge mysql.com:/home/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1-TDC
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/key.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/parse_file.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/structs.h:
Auto merged
sql/field.cc:
Merge with global tree
sql/sql_base.cc:
Merge with global tree
sql/table.cc:
Merge with global tree
Diffstat (limited to 'sql/share/errmsg.txt')
0 files changed, 0 insertions, 0 deletions