diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-30 17:57:45 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-30 17:57:45 +0300 |
| commit | ae03b232ccb807c1351c1ee008bb9d6f06c22d50 (patch) | |
| tree | 13e311ba7aa72c34d371f437822a5e75aa203adc /dbug/monty.doc | |
| parent | 3ce0cadd05e00b31934af0bbf3b1f18891404a8e (diff) | |
| parent | b372ebc5ef988bd08dfa86f491cd325bc83e4b7c (diff) | |
| download | mariadb-git-ae03b232ccb807c1351c1ee008bb9d6f06c22d50.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21915
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Manual merge.
Diffstat (limited to 'dbug/monty.doc')
0 files changed, 0 insertions, 0 deletions