diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-05-02 12:11:59 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-05-02 12:11:59 +0300 |
| commit | 02af55835fe1f6c3e5dd836dbf2daa7067a140b3 (patch) | |
| tree | 7239423735ba617754598e318d8ffe0668ad8377 /sql/mysqld.cc | |
| parent | 55153730b2aadba899284b2862647edefaa44757 (diff) | |
| parent | 4958eec7ec52f4208deb1dad18900af6db728b66 (diff) | |
| download | mariadb-git-02af55835fe1f6c3e5dd836dbf2daa7067a140b3.tar.gz | |
Merge nosik:/my/mysql-5.1
into mysql.com:/home/my/mysql-5.1
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d6efebd32c4..796dc72a98d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -225,8 +225,10 @@ static const char *sql_mode_names[]= "ERROR_FOR_DIVISION_BY_ZERO", "TRADITIONAL", "NO_AUTO_CREATE_USER", "HIGH_NOT_PRECEDENCE", "NO_ENGINE_SUBSTITUTION", + "PAD_CHAR_TO_FULL_LENGTH", NullS }; + static const unsigned int sql_mode_names_len[]= { /*REAL_AS_FLOAT*/ 13, @@ -259,8 +261,10 @@ static const unsigned int sql_mode_names_len[]= /*TRADITIONAL*/ 11, /*NO_AUTO_CREATE_USER*/ 19, /*HIGH_NOT_PRECEDENCE*/ 19, - /*NO_ENGINE_SUBSTITUTION*/ 22 + /*NO_ENGINE_SUBSTITUTION*/ 22, + /*PAD_CHAR_TO_FULL_LENGTH*/ 23 }; + TYPELIB sql_mode_typelib= { array_elements(sql_mode_names)-1,"", sql_mode_names, (unsigned int *)sql_mode_names_len }; |