diff options
| author | unknown <serg@serg.mysql.com> | 2003-03-13 11:23:34 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-03-13 11:23:34 +0100 |
| commit | d367d5ddb8644123330b962ee340b818e69f7f4f (patch) | |
| tree | bd5f7ec7b4c2237c03a64a02c718028a5416a28d | |
| parent | 3dfcd944fe2fe6d866867ba6c5a0b16016b4bdcc (diff) | |
| parent | 8fa237edd334cecfd8b69acb6c6485456955116f (diff) | |
| download | mariadb-git-d367d5ddb8644123330b962ee340b818e69f7f4f.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
sql/mysqld.cc:
Auto merged
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 411c9778c3e..75e2599ce6b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3423,7 +3423,7 @@ struct my_option my_long_options[] = {"safemalloc-mem-limit", OPT_SAFEMALLOC_MEM_LIMIT, "Simulate memory shortage when compiled with the --with-debug=full option", 0, 0, 0, GET_ULL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"new", 'n', "Use very new possible 'unsafe' functions", + {"new", 'n', "Use some 4.1 features and syntax (4.1 compatibility mode)", (gptr*) &global_system_variables.new_mode, (gptr*) &max_system_variables.new_mode, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, |