summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51tsmith@siva.hindu.god2007-01-185-1/+54
|\ | | | | | | into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
| * Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51tsmith@siva.hindu.god2007-01-185-1/+54
| |\ | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
| | * Remove wait until not readonlymsvensson@neptunus.(none)2007-01-161-2/+0
| | |
| | * Cset exclude: ↵msvensson@neptunus.(none)2007-01-151-0/+5
| | | | | | | | | | | | cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa|ChangeSet|20070111195403|30218
| | * Revert to old behavior. Including code to verify that a cluster is notcmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa2007-01-111-5/+0
| | | | | | | | | | | | | | | | | | | | | readonly seems like a good idea, but the test suite isn't expecting those statements in some places. Figure out how we want to use this code later.
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2007-01-075-1/+56
| | |\ | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
| | | * Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-265-1/+56
| | | |\ | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
| | | | * Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttsmith/tim@siva.hindu.god2006-12-223-0/+39
| | | | |\ | | | | | | | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/51
| | | | | * Add the missing filemsvensson@pilot.mysql.com2006-12-221-0/+31
| | | | | |
| | | | | * Wait for mysqld connected to NDB to come out of read only modemsvensson@pilot.mysql.com2006-12-222-0/+8
| | | | | |
| | | | * | Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-212-0/+39
| | | | |\ \ | | | | | |/ | | | | |/| | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/51
| | | | * | Add support for loading example plugin and add plugin.testmsvensson@neptunus.(none)2006-12-152-1/+17
| | | | | |
* | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2007-01-122-8/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
| * | | | | Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-12-082-8/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge
| | * | | | WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.cbell/Chuck@suse.vabb.com2006-12-072-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Please see worklog for details on files changed.
* | | | | | Merge mysql.com:/d2/hf/clean/my51-cleanholyfoot/hf@hfmain.(none)2006-12-311-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | into mysql.com:/d2/hf/common/my51-common
| * | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-12-081-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into mysql.com:/home/hf/work/embt/my51-embt
| | * | | | Merge mysql.com:/home/hf/work/embt/my50-embtholyfoot/hf@deer.(none)2006-11-131-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/embt/my51-embt
| | | * | | | several fixes to make tests pass in embedded-server modeholyfoot/hf@mysql.com/deer.(none)2006-11-131-0/+1
| | | | | | |
* | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2006-12-261-0/+15
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | into xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
| * | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-enginessvoj@june.mysql.com2006-12-261-0/+15
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines
* | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1patg@radha.patg.net2006-12-222-0/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
| * | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildtsmith/tim@siva.hindu.god2006-12-202-0/+39
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | | into siva.hindu.god:/usr/home/tim/m/bk/51-build
| | * | | | Added innodb_rollback_on_timeout option to restore the 4.1 tsmith/tim@siva.hindu.god2006-12-191-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | InnoDB timeout behavior (Bug #24200)
* | | | | | WL #3031patg@radha.myhome.westell.com2006-12-111-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * New result files due to new error message/error numbers * Fixed system_mysql_db tests to work with servers table * Added UTF8 charset to table defs
* | | | | Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to ↵mskold/marty@mysql.com/linux.site2006-12-011-3/+3
| | | | | | | | | | | | | | | | | | | | mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
* | | | | Fixed portablity problemmonty@mysql.com/nosik.monty.fi2006-11-282-2/+2
| | | | | | | | | | | | | | | | | | | | Removed warnings from mysqltest scripts
* | | | | Fixed a LOT of compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing DBUG_RETURN statements (in mysqldump.c) Added missing enums Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
* | | | | Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-222-9/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/nosik.monty.fi2006-11-202-9/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-202-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #)
| * | | | | Merge mysql.com:/home/bkroot/mysql-5.0-rpllars@mysql.com/black.(none)2006-11-131-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.0-merge
| | * | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2006-11-071-0/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
* | | \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@nosik.monty.fi2006-11-212-3/+81
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| * | | | | | Added --debug-info to most clients to detect memory leaks in mysql-test-runmonty@mysql.com/nosik.monty.fi2006-11-212-3/+81
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved .progress files into the log directory Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23 Fixed some compiler warnings Fixed small memory leak in libmysql Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
* | | | | | Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-11-131-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge
| * \ \ \ \ \ Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2006-11-071-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
| | * \ \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-5.0.b18908bar@bar.intranet.mysql.r18.ru2006-11-011-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | | | |_|/ / | | | |/| | | into mysql.com:/usr/home/bar/mysql-5.1-rpl
| | | * | | | Bug#18908: ERROR 1406 (22001): Data too long for column :: using utf8bar@mysql.com/bar.intranet.mysql.r18.ru2006-10-301-0/+4
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Too confusing error message when cannot convert between string and column character sets on INSERT and UPDATE. Fix: producing a better error message, instead of "Data too long" in such cases Additional changes: Adding "DROP TABLE IF EXISTS" into several tests to be safe against failures in previous tests.
* | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0df@kahlann.erinye.com2006-11-101-0/+11
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/51
| * | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1df@kahlann.erinye.com2006-11-101-0/+11
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
| | * | | | add --report-features to mysql-test-run.pldf@kahlann.erinye.com2006-11-101-0/+11
| | | | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-11-026-141/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
* | \ \ \ \ \ Merge alik.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@alik.2006-11-077-148/+91
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-11-027-148/+91
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| | * \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maintthek@kpdesk.mysql.com2006-11-021-0/+25
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
| | | * | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@shellback.(none)2006-10-311-0/+25
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
| | | | * | | | Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@shellback.(none)2006-10-301-0/+25
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
| | | | | * | | | Bug#18654 Test is timing-dependent and fails from scheduling effects (?)msvensson@shellback.(none)2006-10-301-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Wait in loop with small sleep until tables has been renamed
| | * | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintmsvensson@shellback.(none)2006-10-301-2/+7
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
View Lorry Controller Status