diff options
| author | unknown <monty@nosik.monty.fi> | 2006-11-27 14:07:52 +0200 |
|---|---|---|
| committer | unknown <monty@nosik.monty.fi> | 2006-11-27 14:07:52 +0200 |
| commit | 24bbc92bddaa4e7e99c6e6d3c1e50d05f87e6507 (patch) | |
| tree | 854da1ac89162145e99744fab50d0ea2da4045ed /include/my_user.h | |
| parent | 6ea76b816c5865ba545a18c22c85310ebd993db4 (diff) | |
| parent | f700408717ea7d51132c150a9afaddcb73071b49 (diff) | |
| download | mariadb-git-24bbc92bddaa4e7e99c6e6d3c1e50d05f87e6507.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
BUILD/SETUP.sh:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/log_event.cc:
Manual merge
sql/sql_binlog.cc:
Manual merge
Diffstat (limited to 'include/my_user.h')
0 files changed, 0 insertions, 0 deletions