1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
This commit is contained in:
unknown 2005-04-08 19:57:07 +02:00
commit 693663e1ec
8 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VC++Files/client/mysqlclient.dsp
View File

@ -147,6 +147,10 @@ SOURCE="..\strings\ctype-bin.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-czech.c"
# End Source File
# Begin Source File
@ -155,6 +159,10 @@ SOURCE="..\strings\ctype-euc_kr.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-eucjpms.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-extra.c"
# End Source File
# Begin Source File

8
VC++Files/client/mysqlclient_ia64.dsp
View File

@ -147,6 +147,10 @@ SOURCE="..\strings\ctype-bin.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-czech.c"
# End Source File
# Begin Source File
@ -155,6 +159,10 @@ SOURCE="..\strings\ctype-euc_kr.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-eucjpms.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-extra.c"
# End Source File
# Begin Source File

8
VC++Files/libmysql/libmysql.dsp
View File

@ -139,6 +139,10 @@ SOURCE="..\strings\ctype-bin.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-czech.c"
# End Source File
# Begin Source File
@ -147,6 +151,10 @@ SOURCE="..\strings\ctype-euc_kr.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-eucjpms.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-extra.c"
# End Source File
# Begin Source File

8
VC++Files/libmysql/libmysql_ia64.dsp
View File

@ -138,6 +138,10 @@ SOURCE="..\strings\ctype-bin.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-czech.c"
# End Source File
# Begin Source File
@ -146,6 +150,10 @@ SOURCE="..\strings\ctype-euc_kr.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-eucjpms.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-extra.c"
# End Source File
# Begin Source File

8
VC++Files/strings/strings.dsp
View File

@ -113,10 +113,18 @@ SOURCE=".\ctype-bin.c"
# End Source File
# Begin Source File
SOURCE=".\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE=".\ctype-czech.c"
# End Source File
# Begin Source File
SOURCE=".\ctype-eucjpms.c"
# End Source File
# Begin Source File
SOURCE=".\ctype-euc_kr.c"
# End Source File
# Begin Source File

8
VC++Files/strings/strings_ia64.dsp
View File

@ -112,6 +112,10 @@ SOURCE=".\ctype-bin.c"
# End Source File
# Begin Source File
SOURCE=".\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE=".\ctype-czech.c"
# End Source File
# Begin Source File
@ -120,6 +124,10 @@ SOURCE=".\ctype-euc_kr.c"
# End Source File
# Begin Source File
SOURCE=".\ctype-eucjpms.c"
# End Source File
# Begin Source File
SOURCE=".\ctype-extra.c"
# End Source File
# Begin Source File

2
include/config-win.h
View File

@ -378,6 +378,7 @@ inline double ulonglong2double(ulonglong value)
/* #undef HAVE_CHARSET_armscii8 */
/* #undef HAVE_CHARSET_ascii */
#define HAVE_CHARSET_big5 1
#define HAVE_CHARSET_cp932
#define HAVE_CHARSET_cp1250 1
/* #undef HAVE_CHARSET_cp1251 */
/* #undef HAVE_CHARSET_cp1256 */
@ -386,6 +387,7 @@ inline double ulonglong2double(ulonglong value)
/* #undef HAVE_CHARSET_cp852 */
/* #undef HAVE_CHARSET_cp866 */
/* #undef HAVE_CHARSET_dec8 */
#define HAVE_CHARSET_eucjpms 1
#define HAVE_CHARSET_euckr 1
#define HAVE_CHARSET_gb2312 1
#define HAVE_CHARSET_gbk 1

2
sql/ha_ndbcluster.cc
View File

@ -4107,7 +4107,7 @@ ulonglong ha_ndbcluster::get_auto_increment()
DBUG_ENTER("get_auto_increment");
DBUG_PRINT("enter", ("m_tabname: %s", m_tabname));
Ndb *ndb= get_ndb();
if (m_rows_inserted > m_rows_to_insert)
/* We guessed too low */
m_rows_to_insert+= m_autoincrement_prefetch;