Commit 127b0271 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
parents dc134323 533b3f0a

VC++Files/client/mysqlclient.dsp

+8 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/client/mysqlclient_ia64.dsp

+8 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/libmysql/libmysql.dsp

+8 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/libmysql/libmysql_ia64.dsp

+8 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/strings/strings.dsp

+8 −0
Original line number Diff line number Diff line
@@ -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