diff options
| author | unknown <cmiller@maint1.mysql.com> | 2006-08-23 19:41:46 +0200 |
|---|---|---|
| committer | unknown <cmiller@maint1.mysql.com> | 2006-08-23 19:41:46 +0200 |
| commit | df4cbda0437b572ae151331cf4a1dda1b8f85d5e (patch) | |
| tree | b010a4b2ad4eb874dd1e3f5c37a900ab31cd57e8 /sql/gen_lex_hash.cc | |
| parent | 0a25f54554fd42afb32086d06cd1a978c2cf96d8 (diff) | |
| parent | f9832bf116b2525afa79267cfea6cd8360e418f6 (diff) | |
| download | mariadb-git-df4cbda0437b572ae151331cf4a1dda1b8f85d5e.tar.gz | |
Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/gen_lex_hash.cc:
Manual merge
Diffstat (limited to 'sql/gen_lex_hash.cc')
| -rw-r--r-- | sql/gen_lex_hash.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index e59986092e4..b110120bdf5 100644 --- a/sql/gen_lex_hash.cc +++ b/sql/gen_lex_hash.cc @@ -450,6 +450,7 @@ int main(int argc,char **argv) and you are welcome to modify and redistribute it under the GPL license\n\ \n*/\n\n"); + /* Broken up to indicate that it's not advice to you, gentle reader. */ printf("/* Do " "not " "edit " "this " "file! This is generated by " "gen_lex_hash.cc\nthat seeks for a perfect hash function */\n\n"); printf("#include \"lex.h\"\n\n"); |