into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Merge
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Merge
win/build-vs71.bat:
fixed call out to deploy.bat
win/build-vs8.bat:
fixed call out to deploy.bat
win/cmakefiles/base:
changed win32 to win
win/cmakefiles/sql:
use proper win folder for path
win/configure.js:
this file should be called from the root so we need to use the path
add sql_mode to mysql.event
WL#1034 (Internal CRON)
mysql-test/lib/init_db.sql:
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
mysql-test/r/system_mysql_db.result:
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
scripts/mysql_create_system_tables.sh:
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
scripts/mysql_fix_privilege_tables.sql:
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
win/build-vs71.bat:
batch file to build project files for Visual Studio 2003
win/build-vs8.bat:
batch file to build project files for Visual Studio 2005
win/cmakefiles/base:
cmakefile that will later be moved into the target directory
win/cmakefiles/bdb:
cmakefile that will later be moved into the target directory
win/cmakefiles/client:
cmakefile that will later be moved into the target directory
win/cmakefiles/dbug:
cmakefile that will later be moved into the target directory
win/cmakefiles/deploy.bat:
cmakefile that will later be moved into the target directory
win/cmakefiles/extra:
cmakefile that will later be moved into the target directory
win/cmakefiles/heap:
cmakefile that will later be moved into the target directory
win/cmakefiles/innobase:
cmakefile that will later be moved into the target directory
win/cmakefiles/myisam:
cmakefile that will later be moved into the target directory
win/cmakefiles/myisammrg:
cmakefile that will later be moved into the target directory
win/cmakefiles/mysys:
cmakefile that will later be moved into the target directory
win/cmakefiles/regex:
cmakefile that will later be moved into the target directory
win/cmakefiles/sql:
cmakefile that will later be moved into the target directory
win/cmakefiles/strings:
cmakefile that will later be moved into the target directory
win/cmakefiles/taocrypt:
cmakefile that will later be moved into the target directory
win/cmakefiles/vio:
cmakefile that will later be moved into the target directory
win/cmakefiles/yassl:
cmakefile that will later be moved into the target directory
win/cmakefiles/zlib:
cmakefile that will later be moved into the target directory
win/config-handlerton.js:
javascript file for updating handlerton.cc based on configure options
win/config-version.js:
javascript file for updating mysql_version.h based on configure.in data
win/configure.js:
basic configure javascript
into neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302
client/mysqltest.c:
Already in 5.0
sql/sql_db.cc:
"mysql_create_db" is already silent in 5.0
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
- Change mysqltest to detect when there aren't as many warnings available as was reported.
client/mysqltest.c:
Call "die" if warnings were reported but there weren't any warnings to retrieve
sql/sql_db.cc:
Don't call "send_ok" if in silent mode.
last bug fix revealed another bug.
fix buffer management when parsing table descriptor
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
remove pages on backup record, use buffer in file record instead
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
remove useless pages on backup record
file buffer is good enough
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
remove useless pages on backup record
file buffer is good enough
into asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new
BitKeeper/etc/ignore:
Added BitKeeper/etc/RESYNC_TREE to the ignore list
client/mysqltest.c:
merged
mysql-test/r/mysqltest.result:
merged
mysql-test/t/mysqltest.test:
merged
into mysql.com:/usr/local/mysql/x/mysql-5.1-new
VC++Files/sql/mysqld.vcproj:
Auto merged
sql/event.h:
Auto merged
sql/event_executor.cc:
Auto merged
sql/event_timed.cc:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
VC++Files/client/mysqldump.vcproj:
Manual merge.
WL#1034 (Internal CRON)
mysql-test/r/events.result:
fix result of t/events (post-merge fix of bug #16642)
mysql-test/r/system_mysql_db.result:
fix result(post-merge fix of bug #16642)
mysql-test/t/events.test:
fix test, use --echo instead of select, fix failing create event statement
sql/event_timed.cc:
add a bit more debug information
This bug was fixed through other patches. This test case just shows
that it is fixed.
mysql-test/r/partition_hash.result:
result block for bug #14524
mysql-test/t/partition_hash.test:
test block for bug# 14524
