diff options
| author | unknown <aelkin/andrei@mysql1000.(none)> | 2008-02-20 23:25:01 +0200 |
|---|---|---|
| committer | unknown <aelkin/andrei@mysql1000.(none)> | 2008-02-20 23:25:01 +0200 |
| commit | 7b85da497eb3251224576c079723fe6fe0b2da5c (patch) | |
| tree | d9deadc696e01f16cc22d93fd60399c7b2f33d74 /sql/structs.h | |
| parent | 34838645cb849ebc6065bb2e3944f7ea006309fc (diff) | |
| parent | e19c8e2ebfdb5c2a50e71d4192681b8b4bd4efad (diff) | |
| download | mariadb-git-7b85da497eb3251224576c079723fe6fe0b2da5c.tar.gz | |
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug31316-sss_server_id_clashes
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/structs.h')
0 files changed, 0 insertions, 0 deletions