diff options
| author | unknown <serg@serg.mylan> | 2006-02-13 23:27:51 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-02-13 23:27:51 +0100 |
| commit | 3649a68fab9132828125e9b1107cfc7fb4201699 (patch) | |
| tree | 3d5a3d14033679124ac742e1cc561d1bddbec755 /sql/sql_lex.cc | |
| parent | c4b5ba5643d2b3e734445bc6236bc31b7c78feac (diff) | |
| parent | 8017e9c4e726f8ab6b8b2c71f81e0e0036c21fcd (diff) | |
| download | mariadb-git-3649a68fab9132828125e9b1107cfc7fb4201699.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
sql/sql_plugin.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
0 files changed, 0 insertions, 0 deletions