diff options
author | monty@narttu.mysql.fi <> | 2003-11-03 14:01:59 +0200 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2003-11-03 14:01:59 +0200 |
commit | a444a3449f87ad4c8060fe5769c0bae7a1b64eaf (patch) | |
tree | f9406690fb9f579e21f4877826d439fb785d6902 /VC++Files | |
parent | d9eca0e1271a5d8c9305ca1b7b9eada084cb61dc (diff) | |
download | mariadb-git-a444a3449f87ad4c8060fe5769c0bae7a1b64eaf.tar.gz |
Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
Diffstat (limited to 'VC++Files')
-rw-r--r-- | VC++Files/libmysqld/libmysqld.dsp | 4 | ||||
-rw-r--r-- | VC++Files/sql/mysqld.dsp | 20 | ||||
-rw-r--r-- | VC++Files/sql/mysqldmax.dsp | 16 | ||||
-rw-r--r-- | VC++Files/strings/strings.dsp | 4 |
4 files changed, 44 insertions, 0 deletions
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index 593c53a57ba..953761be297 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -446,6 +446,10 @@ SOURCE=..\strings\strcont.c # End Source File # Begin Source File +SOURCE=..\sql\strfunc.cpp +# End Source File +# Begin Source File + SOURCE=..\strings\strinstr.c # End Source File # Begin Source File diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index f8724fb0b06..b8413a9a7ae 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -1253,6 +1253,26 @@ SOURCE=.\sql_yacc.cpp # End Source File # Begin Source File +SOURCE=.\strfunc.cpp + +!IF "$(CFG)" == "mysqld - Win32 Release" + +!ELSEIF "$(CFG)" == "mysqld - Win32 Debug" + +# ADD CPP /G5 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "mysqld - Win32 nt" + +!ELSEIF "$(CFG)" == "mysqld - Win32 Max nt" + +!ELSEIF "$(CFG)" == "mysqld - Win32 Max" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\table.cpp # End Source File # Begin Source File diff --git a/VC++Files/sql/mysqldmax.dsp b/VC++Files/sql/mysqldmax.dsp index 24ea83159d9..a7ed1b918c7 100644 --- a/VC++Files/sql/mysqldmax.dsp +++ b/VC++Files/sql/mysqldmax.dsp @@ -945,6 +945,22 @@ SOURCE=.\sql_yacc.cpp # End Source File # Begin Source File +SOURCE=.\strfunc.cpp + +!IF "$(CFG)" == "mysqldmax - Win32 Release" + +!ELSEIF "$(CFG)" == "mysqldmax - Win32 Debug" + +# ADD CPP /G5 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "mysqldmax - Win32 nt" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\table.cpp # End Source File # Begin Source File diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp index 038f460771d..4e43cc875c8 100644 --- a/VC++Files/strings/strings.dsp +++ b/VC++Files/strings/strings.dsp @@ -188,6 +188,10 @@ SOURCE=.\longlong2str.c # End Source File # Begin Source File +SOURCE=.\my_strtoll10.c +# End Source File +# Begin Source File + SOURCE=.\my_vsnprintf.c # End Source File # Begin Source File |