BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.
mysql-test/r/archive.result:
Warning is not produced anymore
sql/examples/ha_archive.cc:
Change ha_archive::rename_table to avoid warning when trying to rename non existent file.
mysql-test/r/archive.result:
Changed order of tests so that the are before the unpredictable INSERT DELAYED
Warning is produced during the rename
mysql-test/t/archive.test:
Changed order of tests so that the are before the unpredictable INSERT DELAYED
Warning is produced during the rename
(Review on irc by monty)
mysql-test/r/sp-error.result:
Renamed a procedure and function to avoid confusion
mysql-test/t/sp-error.test:
Renamed a procedure and function to avoid confusion
sql/item_func.cc:
Corrected (and better) way to set/reset the client cap. flag in Item_func_sp::execute()
sql/share/errmsg.txt:
Changed the ER_SP_BADSELECT error; more accurate, and includes the procedure name.
sql/sql_parse.cc:
Include the procedure name in the new error message.
mysql-test/r/func_math.result:
after merge fix:
the test should be added after we have new hf's pm code pushed.
mysql-test/t/func_math.test:
after merge fix:
the test should be added after we have new hf's pm code pushed.
- Reverted removal of errorcheck mutex initialise, used in safe_mutex_init.
include/my_pthread.h:
Reverted the removal of errorcheck mutex initializer
mysys/my_thr_init.c:
Reverted the removal of errorcheck mutex initializer
Add destruction of mutex initializer
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
BUILD/SETUP.sh:
Manual merge of conflicts
-DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
manual merge
mysql-test/r/archive.result:
Manual merge
mysql-test/t/archive.test:
Manual merge
- Made a script that selects the best compiler optimizations for the current cpu.
- Use the script from BUILD/SETUP.sh
BUILD/SETUP.sh:
Run check-cpu and use the compiler optimization flags it outputs
Fix compilation error if HAVE_REPLICATION is not defined
sql/mysqld.cc:
Fix compilation error if HAVE_REPLICATION is not defined
sql/ha_innodb.cc:
Fix compilation error if HAVE_REPLICATION is not defined
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
configure.in:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
- Remove linking of libsupc++
- Move all local static variables to filescope
configure.in:
Remove linking with libsupc++
sql/examples/ha_archive.cc:
Move local static variables to file scope
sql/examples/ha_example.cc:
Move local static variables to file scope
sql/examples/ha_tina.cc:
Move local static variables to file scope
sql/ha_berkeley.cc:
Move local static variables to file scope
sql/ha_blackhole.cc:
Move local static variables to file scope
sql/ha_federated.cc:
Move local static variables to file scope
sql/ha_heap.cc:
Move local static variables to file scope
sql/ha_innodb.cc:
Move local static variables to file scope
sql/ha_myisam.cc:
Move local static variables to file scope
sql/ha_myisammrg.cc:
Move local static variables to file scope
sql/ha_ndbcluster.cc:
Move local static variables to file scope
sql/item.cc:
Move local static instance variables to file scope
sql/item_sum.cc:
Move local static variables to file scope
- Display error if system readline or libedit can't be found
configure.in:
Display an error if user has selected not to use the bundled libedit or readline, AND the system readline or libedit can't be found
- Changed makelist.sh
- Bump up required version of autoconf
- Use new style to init mutex in my_thr_init
cmd-line-utils/libedit/makelist.sh:
Changed file so it works also on windows cr/lf files.
configure.in:
Bump up required AC version number so that correct version of aclocal and autoconf is selected.
include/my_pthread.h:
Use PTHREAD_MUTEX_ADAPTIVE_NP to see if "fast" mutexes are available
Remove "errorcheck" mutexes, since they are never used.
mysys/my_thr_init.c:
Use new style functions to init mutex if PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP is defined
Add comment what mutex "kind" means
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/fil/fil0fil.c:
Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/include/dict0dict.h:
Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
innobase/dict/dict0dict.c:
Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
