diff options
| author | unknown <sergefp@mysql.com> | 2004-04-28 19:27:56 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-04-28 19:27:56 +0400 |
| commit | 2902f9e8a57ca76cc52863d70d02dcf7693ce8cd (patch) | |
| tree | 4864372894fc29ff2e4d9de93f2c438b29184acb /sql/sql_prepare.cc | |
| parent | 15e207b0e7d1cd010b9e0eea4663c98e1eb209de (diff) | |
| parent | 5605374b668068ef5ede826b3d04e2fe7ead4f9f (diff) | |
| download | mariadb-git-2902f9e8a57ca76cc52863d70d02dcf7693ce8cd.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
0 files changed, 0 insertions, 0 deletions