into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/r/create.result:
Merge
mysql-test/t/create.test:
Merge
mysql-test/t/view.test:
Remove the disable_warnings part as engine=innodb has been removed
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Improve code that detects if ndb shuold be installed
Remove call to stop_all_servers after install db, if any servers are still running
and need to be stopped they will be stopped atuomatically
mysql-test/lib/mtr_cases.pl:
All tests that have "source include/have_ndb.inc" are ndb tests
mysql-test/mysql-test-run.pl:
Set --with-ndbcluster to only be valid together with --bench
Rename opt_ndbcluster_supported to glob_ndbcluster_supported it's not an option
Fix warnings
Remove table engine qualification where it's unnecessary.
mysql-test/r/view.result:
Remove requirement for innodb where not needed. (Running this test alone
raised warnings that it was using myisam.)
mysql-test/t/view.test:
Remove requirement for innodb where not needed. (Running this test alone
raised warnings that it was using myisam.)
sql/sql_parse.cc:
Fix previous bad re-patch.
sql/sql_view.cc:
Fix previous bad re-patch.
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Set comment properly before calling mtr_report_test failed and report_failure_restart
mysql-test/lib/mtr_report.pl:
Remove warnings
No need to check ndb installed ok here, when that is detected comment is set to indicate the problem
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
mysql-test/r/ps.result:
Manual merge
mysql-test/t/ps.test:
Manual merge
extra/yassl/include/yassl_int.hpp:
Netware and HPUX need the _POSIX_THREADS define to be forced
extra/yassl/taocrypt/include/hmac.hpp:
Prefix with HMAC as we get symbol conflicts on HPUX
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_dbug.h:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/csv.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/csv.test:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/t/func_time.test:
Manual merge, test already there
mysql-test/t/innodb_mysql.test:
Manual merge
mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.
client/mysqltest.c:
Use char as datatype for the byte that are read with my_fgetc
mysql-test/mysql-test-run.pl:
Fix typo, add missing $
We don't set null_value to 0 in the Item_func_compress::val_str() for
not-NULL results.
mysql-test/r/func_compress.result:
Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
- test result.
mysql-test/t/func_compress.test:
Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
- test case.
sql/item_strfunc.cc:
Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
- set null_value.
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262
BitKeeper/deleted/.del-collapsed:
'Auto converge rename'
BitKeeper/etc/collapsed:
'Auto converge'
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.h:
Auto merged
vio/viosocket.c:
Auto merged
sql/sql_parse.cc:
Manual merge
sql/sql_view.cc:
Manual merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678
BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220:
Use local.
include/violite.h:
Use local.
sql/net_serv.cc:
Use local.
vio/viosocket.c:
Use local.
