diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-12 18:06:26 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-12 18:06:26 +0400 |
| commit | 8acc9a961211fe96f5a57e5c9fad4cbc0af61445 (patch) | |
| tree | 9bb710317c1d7551d4796293a97bbbf53950debb /sql-common/my_time.c | |
| parent | aef96fd0a546b4ac185abd5bd7208d72e0a0cbe7 (diff) | |
| parent | 6d1fdc7308d73c439d7a2da6851199939cde93f4 (diff) | |
| download | mariadb-git-8acc9a961211fe96f5a57e5c9fad4cbc0af61445.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20953
mysql-test/r/view.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp-error.result:
Manual merge.
Diffstat (limited to 'sql-common/my_time.c')
0 files changed, 0 insertions, 0 deletions