Commit c5737325 authored by unknown's avatar unknown
Browse files

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

into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
parents 93da32ac 20542236

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Sinisa@sinisa.nasamreza.org 
WAX@sergbook.mysql.com

acurtis@ltantony.rdg.cyberkinetica.homeunix.net

acurtis@pcgem.rdg.cyberkinetica.com

acurtis@xiphis.org

administrador@light.hegel.local

ahlentz@co3064164-a.rochd1.qld.optusnet.com.au

akishkin@work.mysql.com

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