← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/falcon/Connection.cpp

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/falcon/Connection.cpp
923
923
        if (filename)
924
924
                IO::expandFileName(filename, sizeof(dbFileName), dbFileName);
925
925
        else
926
 
                {
 
926
                { 
927
927
                if (!registry.findDatabase (dbName, sizeof (dbFileName), dbFileName))
928
928
                        throw SQLEXCEPTION (CONNECTION_ERROR, "can't find database \"%s\"", dbName);
929
929
                }
1030
1030
        Sync sync (&databaseList, "Connection::createDatabase");
1031
1031
        sync.lock (Exclusive);
1032
1032
 
 
1033
#ifndef STORAGE_ENGINE
1033
1034
        if (!registry.findDatabase (dbName, sizeof (dbFileName), dbFileName))
 
1035
#endif
1034
1036
                for (Database *db = firstDatabase; db; db = db->next)
1035
1037
                        if (db->matches (fileName))
1036
1038
                                {
1039
1041
                                break;
1040
1042
                                }
1041
1043
 
1042
 
        try
1043
 
                {
1044
 
                registry.defineDatabase (dbName, fileName);
1045
 
                
1046
 
                if (!registry.findDatabase (dbName, sizeof (dbFileName), dbFileName))
1047
 
                        strcpy(dbFileName, fileName);
1048
 
                }
1049
 
        catch(...)
1050
 
                {
1051
1044
#ifdef STORAGE_ENGINE
 
1045
        strcpy(dbFileName, fileName);
 
1046
#else
 
1047
        registry.defineDatabase (dbName, fileName);
 
1048
        
 
1049
        if (!registry.findDatabase (dbName, sizeof (dbFileName), dbFileName))
1052
1050
                strcpy(dbFileName, fileName);
1053
 
#else
1054
 
                throw;
 
1051
 
1055
1052
#endif
1056
 
                }
1057
1053
 
1058
1054
        database = new Database (dbName, configuration, threads);
1059
1055
 
1060
 
#ifdef STORAGE_ENGINE
1061
 
        //strcpy(dbFileName, fileName);
1062
 
#endif
1063
 
        
1064
1056
        try
1065
1057
                {
1066
1058
                database->createDatabase (dbFileName);