Commit 6f7ead2c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 995e29f0 f1e648d2

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ bar@bar.intranet.mysql.r18.ru 
bar@bar.mysql.r18.ru

bar@bar.udmsearch.izhnet.ru

bar@deer.(none)

bar@eagle.intranet.mysql.r18.ru

bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru
@@ -227,6 +228,7 @@ salle@vafla.online.bg 
sasha@mysql.sashanet.com

serg@build.mysql.com

serg@build.mysql2.com

serg@mysql.com

serg@serg.mylan

serg@serg.mysql.com

serg@sergbook.mylan

BitKeeper/triggers/pre-commit

+11 −0
Original line number Diff line number Diff line 
#!/bin/sh



if [ "$BK_USER" = "Administrator" -o "$BK_USER" = "mysqldev" ]

then

 echo "Error: you cannot commit as 'Administrator' or 'mysqldev' user."

 echo "as a workaround set BK_USER to your nickname"

 echo "e.g.: export BK_USER='bar'"

 echo ""

 echo "Checkin FAILED!"

 echo "Set BK_USER and retry."

 exit 1

fi



if [ "$REAL_EMAIL" = "" ]

then

 echo "Error: you must set REAL_EMAIL in your profile"

VC++Files/libmysqld/examples/test_libmysqld.dsp

+1 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ BSC32=bscmake.exe 
# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMTD" /out:"Release/mysql-server.exe"

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\test_libmysqld.exe"

# Begin Target



# Name "test_libmysqld - Win32 Release"
@@ -71,9 +71,5 @@ SOURCE=..\..\client\readline.cpp 
SOURCE=..\..\client\sql_string.cpp

# End Source File

# End Group

# Begin Source File



SOURCE=..\..\lib_release\libmysqld.lib

# End Source File

# End Target

# End Project

VC++Files/mysql.dsw

+0 −18
Original line number Diff line number Diff line
@@ -3,21 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 


###############################################################################



Project: "MySqlManager"=".\mysqlmanager\MySqlManager.dsp" - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name mysqlclient

    End Project Dependency

}}}



###############################################################################



Project: "bdb"=".\bdb\bdb.dsp" - Package Owner=<4>



Package=<5>
@@ -420,9 +405,6 @@ Package=<4> 
    Project_Dep_Name mysqlimport

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name MySqlManager

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mysqlshow

    End Project Dependency

    Begin Project Dependency

VC++Files/mysql_ia64.dsw

+0 −3
Original line number Diff line number Diff line
@@ -508,9 +508,6 @@ Package=<4> 
    Project_Dep_Name mysqlimport

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name MySqlManager

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mysqlshow

    End Project Dependency

    Begin Project Dependency