summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg@trift2. <>2006-07-24 19:27:01 +0200
committerjoerg@trift2. <>2006-07-24 19:27:01 +0200
commit5e442de3982dc84789308c6836ab90554de145ca (patch)
tree52798310e14d3251ce2d99c0556f1df8bf832402
parentd8151b6368fb410aad5496afd7761edd82fb4388 (diff)
parentb7cf8cefe9b478ad5d4747426c93bd405bc7e362 (diff)
downloadmariadb-git-5e442de3982dc84789308c6836ab90554de145ca.tar.gz
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into trift2.:/M41/push-4.1
-rw-r--r--VC++Files/libmysqld/libmysqld.dsp4
-rw-r--r--VC++Files/libmysqld/libmysqld.vcproj36
-rw-r--r--VC++Files/libmysqld/libmysqld_ia64.dsp4
-rw-r--r--VC++Files/mysqldemb/mysqldemb.dsp4
-rw-r--r--VC++Files/mysqldemb/mysqldemb.vcproj36
-rw-r--r--VC++Files/mysqldemb/mysqldemb_ia64.dsp4
-rw-r--r--VC++Files/sql/mysqld.dsp4
-rw-r--r--VC++Files/sql/mysqld.vcproj76
-rw-r--r--VC++Files/sql/mysqld_ia64.dsp4
-rw-r--r--VC++Files/sql/mysqldmax.dsp16
-rw-r--r--VC++Files/sql/mysqldmax_ia64.dsp25
-rw-r--r--sql/field.cc46
-rw-r--r--sql/field.h2
-rw-r--r--strings/strtod.c2
14 files changed, 238 insertions, 25 deletions
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp
index 0e3e6af03f0..a07f94ef135 100644
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -468,6 +468,10 @@ SOURCE=..\sql\sql_load.cpp
# End Source File
# Begin Source File
+SOURCE=..\sql\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\sql\sql_manager.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj
index ecbd7383478..a557290117b 100644
--- a/VC++Files/libmysqld/libmysqld.vcproj
+++ b/VC++Files/libmysqld/libmysqld.vcproj
@@ -2946,6 +2946,42 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\sql\sql_locale.cpp">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__;$(NoInherit)"
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="pro|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;MYSQL_SERVER;LICENSE=Commercial;_MBCS;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="classic|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\sql\sql_manager.cpp">
<FileConfiguration
Name="Debug|Win32">
diff --git a/VC++Files/libmysqld/libmysqld_ia64.dsp b/VC++Files/libmysqld/libmysqld_ia64.dsp
index fe99ea480c7..49e4750ce6e 100644
--- a/VC++Files/libmysqld/libmysqld_ia64.dsp
+++ b/VC++Files/libmysqld/libmysqld_ia64.dsp
@@ -450,6 +450,10 @@ SOURCE=..\sql\sql_load.cpp
# End Source File
# Begin Source File
+SOURCE=..\sql\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\sql\sql_manager.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/mysqldemb/mysqldemb.dsp b/VC++Files/mysqldemb/mysqldemb.dsp
index a8207d436a0..63a91ee674e 100644
--- a/VC++Files/mysqldemb/mysqldemb.dsp
+++ b/VC++Files/mysqldemb/mysqldemb.dsp
@@ -363,6 +363,10 @@ SOURCE=..\sql\sql_lex.cpp
SOURCE=..\sql\sql_list.cpp
# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_locale.cpp
+# End Source File
# Begin Source File
SOURCE=..\sql\sql_manager.cpp
diff --git a/VC++Files/mysqldemb/mysqldemb.vcproj b/VC++Files/mysqldemb/mysqldemb.vcproj
index 1105e750ee7..8c052735661 100644
--- a/VC++Files/mysqldemb/mysqldemb.vcproj
+++ b/VC++Files/mysqldemb/mysqldemb.vcproj
@@ -2234,6 +2234,42 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\sql\sql_locale.cpp">
+ <FileConfiguration
+ Name="classic|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="pro|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\sql\sql_manager.cpp">
<FileConfiguration
Name="classic|Win32">
diff --git a/VC++Files/mysqldemb/mysqldemb_ia64.dsp b/VC++Files/mysqldemb/mysqldemb_ia64.dsp
index 5b54a7756e1..9d7367e4c0f 100644
--- a/VC++Files/mysqldemb/mysqldemb_ia64.dsp
+++ b/VC++Files/mysqldemb/mysqldemb_ia64.dsp
@@ -365,6 +365,10 @@ SOURCE=..\sql\sql_list.cpp
# End Source File
# Begin Source File
+SOURCE=..\sql\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\sql\sql_manager.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index 4034ac9f5d0..67521a77c6b 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -1610,6 +1610,10 @@ SOURCE=.\sql_load.cpp
# End Source File
# Begin Source File
+SOURCE=.\sql\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\sql_manager.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj
index cc1c0a0e83f..4df723a6560 100644
--- a/VC++Files/sql/mysqld.vcproj
+++ b/VC++Files/sql/mysqld.vcproj
@@ -6084,6 +6084,82 @@
</FileConfiguration>
</File>
<File
+ RelativePath="sql_locale.cpp">
+ <FileConfiguration
+ Name="classic nt|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Max|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Max nt|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="nt|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="pro nt|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ OptimizeForProcessor="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="pro|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="classic|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="sql_manager.cpp">
<FileConfiguration
Name="classic nt|Win32">
diff --git a/VC++Files/sql/mysqld_ia64.dsp b/VC++Files/sql/mysqld_ia64.dsp
index 310f48fcfb9..b7d35751257 100644
--- a/VC++Files/sql/mysqld_ia64.dsp
+++ b/VC++Files/sql/mysqld_ia64.dsp
@@ -1607,6 +1607,10 @@ SOURCE=.\sql_load.cpp
# End Source File
# Begin Source File
+SOURCE=.\sql_locale.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\sql_manager.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/sql/mysqldmax.dsp b/VC++Files/sql/mysqldmax.dsp
index a7ed1b918c7..0b32a59c6d9 100644
--- a/VC++Files/sql/mysqldmax.dsp
+++ b/VC++Files/sql/mysqldmax.dsp
@@ -789,6 +789,22 @@ SOURCE=.\sql_load.cpp
# End Source File
# Begin Source File
+SOURCE=.\sql_locale.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=.\sql_manager.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/sql/mysqldmax_ia64.dsp b/VC++Files/sql/mysqldmax_ia64.dsp
index 9d79d224e4a..444b043b5c2 100644
--- a/VC++Files/sql/mysqldmax_ia64.dsp
+++ b/VC++Files/sql/mysqldmax_ia64.dsp
@@ -1195,6 +1195,31 @@ SOURCE=.\sql_load.cpp
# End Source File
# Begin Source File
+SOURCE=.\sql_locale.cpp
+
+!IF "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\sql_manager.cpp
# End Source File
# Begin Source File
diff --git a/sql/field.cc b/sql/field.cc
index 39d19dc39bc..b66a7d736d0 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -3680,7 +3680,7 @@ int Field_timestamp::store(const char *from,uint len,CHARSET_INFO *cs)
error= 2;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int4store(ptr,tmp);
}
@@ -3738,7 +3738,7 @@ int Field_timestamp::store(longlong nr)
nr, MYSQL_TIMESTAMP_DATETIME, 1);
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int4store(ptr,timestamp);
}
@@ -3762,7 +3762,7 @@ longlong Field_timestamp::val_int(void)
THD *thd= table->in_use;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
temp=uint4korr(ptr);
else
#endif
@@ -3792,7 +3792,7 @@ String *Field_timestamp::val_str(String *val_buffer, String *val_ptr)
val_buffer->length(field_length);
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
temp=uint4korr(ptr);
else
#endif
@@ -3857,7 +3857,7 @@ bool Field_timestamp::get_date(TIME *ltime, uint fuzzydate)
long temp;
THD *thd= table->in_use;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
temp=uint4korr(ptr);
else
#endif
@@ -3894,7 +3894,7 @@ int Field_timestamp::cmp(const char *a_ptr, const char *b_ptr)
{
int32 a,b;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
a=sint4korr(a_ptr);
b=sint4korr(b_ptr);
@@ -3912,7 +3912,7 @@ int Field_timestamp::cmp(const char *a_ptr, const char *b_ptr)
void Field_timestamp::sort_string(char *to,uint length __attribute__((unused)))
{
#ifdef WORDS_BIGENDIAN
- if (!table->db_low_byte_first)
+ if (!table || !table->db_low_byte_first)
{
to[0] = ptr[0];
to[1] = ptr[1];
@@ -3941,7 +3941,7 @@ void Field_timestamp::set_time()
long tmp= (long) table->in_use->query_start();
set_notnull();
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int4store(ptr,tmp);
}
@@ -4329,7 +4329,7 @@ int Field_date::store(const char *from, uint len,CHARSET_INFO *cs)
from, len, MYSQL_TIMESTAMP_DATE, 1);
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int4store(ptr,tmp);
}
@@ -4357,7 +4357,7 @@ int Field_date::store(double nr)
else
tmp=(long) rint(nr);
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int4store(ptr,tmp);
}
@@ -4385,7 +4385,7 @@ int Field_date::store(longlong nr)
else
tmp=(long) nr;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int4store(ptr,tmp);
}
@@ -4411,7 +4411,7 @@ double Field_date::val_real(void)
{
int32 j;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
j=sint4korr(ptr);
else
#endif
@@ -4423,7 +4423,7 @@ longlong Field_date::val_int(void)
{
int32 j;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
j=sint4korr(ptr);
else
#endif
@@ -4438,7 +4438,7 @@ String *Field_date::val_str(String *val_buffer,
val_buffer->alloc(field_length);
int32 tmp;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
tmp=sint4korr(ptr);
else
#endif
@@ -4456,7 +4456,7 @@ int Field_date::cmp(const char *a_ptr, const char *b_ptr)
{
int32 a,b;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
a=sint4korr(a_ptr);
b=sint4korr(b_ptr);
@@ -4474,7 +4474,7 @@ int Field_date::cmp(const char *a_ptr, const char *b_ptr)
void Field_date::sort_string(char *to,uint length __attribute__((unused)))
{
#ifdef WORDS_BIGENDIAN
- if (!table->db_low_byte_first)
+ if (!table || !table->db_low_byte_first)
{
to[0] = ptr[0];
to[1] = ptr[1];
@@ -4698,7 +4698,7 @@ int Field_datetime::store(const char *from,uint len,CHARSET_INFO *cs)
from, len, MYSQL_TIMESTAMP_DATETIME, 1);
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int8store(ptr,tmp);
}
@@ -4739,7 +4739,7 @@ int Field_datetime::store(longlong nr)
MYSQL_TIMESTAMP_DATETIME, 1);
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int8store(ptr,nr);
}
@@ -4766,7 +4766,7 @@ void Field_datetime::store_time(TIME *ltime,timestamp_type type)
set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
}
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
int8store(ptr,tmp);
}
@@ -4792,7 +4792,7 @@ longlong Field_datetime::val_int(void)
{
longlong j;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
j=sint8korr(ptr);
else
#endif
@@ -4812,7 +4812,7 @@ String *Field_datetime::val_str(String *val_buffer,
int part3;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
tmp=sint8korr(ptr);
else
#endif
@@ -4877,7 +4877,7 @@ int Field_datetime::cmp(const char *a_ptr, const char *b_ptr)
{
longlong a,b;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
{
a=sint8korr(a_ptr);
b=sint8korr(b_ptr);
@@ -4895,7 +4895,7 @@ int Field_datetime::cmp(const char *a_ptr, const char *b_ptr)
void Field_datetime::sort_string(char *to,uint length __attribute__((unused)))
{
#ifdef WORDS_BIGENDIAN
- if (!table->db_low_byte_first)
+ if (!table || !table->db_low_byte_first)
{
to[0] = ptr[0];
to[1] = ptr[1];
diff --git a/sql/field.h b/sql/field.h
index 966549516b1..a33cb0a93aa 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -713,7 +713,7 @@ public:
if ((*null_value= is_null()))
return 0;
#ifdef WORDS_BIGENDIAN
- if (table->db_low_byte_first)
+ if (table && table->db_low_byte_first)
return sint4korr(ptr);
#endif
long tmp;
diff --git a/strings/strtod.c b/strings/strtod.c
index da1b4f4baa6..1663cd61b78 100644
--- a/strings/strtod.c
+++ b/strings/strtod.c
@@ -26,7 +26,7 @@
*/
-#include <my_global.h> /* Includes errno.h */
+#include <my_base.h> /* Includes errno.h */
#include <m_ctype.h>
#define MAX_DBL_EXP 308