diff options
| author | unknown <anozdrin/alik@quad.> | 2008-02-26 19:34:02 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.> | 2008-02-26 19:34:02 +0300 |
| commit | 336f2c7e51fbd60a184aca8f7cdc926cf651f7cd (patch) | |
| tree | 4f6c2940e96b98c7499c2146e93e3ff920aed282 /sql/stacktrace.c | |
| parent | 977edd0c8424dd2ee3ab743ef5b6ef16b770bb49 (diff) | |
| parent | fb3f8bdbb6d0eed44e0868e193d9e4f119cd0ee5 (diff) | |
| download | mariadb-git-336f2c7e51fbd60a184aca8f7cdc926cf651f7cd.tar.gz | |
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
client/mysqltest.c:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
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_connect.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Manually merged.
mysql-test/t/disabled.def:
Manually merged.
Diffstat (limited to 'sql/stacktrace.c')
0 files changed, 0 insertions, 0 deletions