diff options
| author | unknown <monty@nosik.monty.fi> | 2006-11-21 23:12:45 +0200 |
|---|---|---|
| committer | unknown <monty@nosik.monty.fi> | 2006-11-21 23:12:45 +0200 |
| commit | 7463704e1c706ea8e76e4d0022383dfd776e458e (patch) | |
| tree | 92c5d6bff5c91f7ab015fea75f2a0f3f14accbfa /mysys/safemalloc.c | |
| parent | 5cffd57e26dec24976242746dcc7f0b477a02690 (diff) | |
| parent | 85a590a26cb2e8d60a630678ae9fbf55fb97f4da (diff) | |
| download | mariadb-git-7463704e1c706ea8e76e4d0022383dfd776e458e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/drop.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/rpl_ndb_dd_advance.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/rpl_ndb_dd_advance.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
client/mysql_upgrade.c:
Manual merge
client/mysqltest.c:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
storage/innobase/handler/ha_innodb.cc:
Manual merge
Diffstat (limited to 'mysys/safemalloc.c')
0 files changed, 0 insertions, 0 deletions