summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460unknown2006-03-0688-1571/+1571
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 mysql-test/r/bigint.result: Auto merged mysql-test/r/binary.result: Auto merged mysql-test/r/case.result: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/events.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/partition.result: Auto merged mysql-test/r/partition_02myisam.result: Auto merged mysql-test/r/partition_mgm_err.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/type_timestamp.result: Auto merged sql/sql_show.cc: Auto merged mysql-test/r/archive_gis.result: Merge bug10460 mysql-test/r/bdb_gis.result: Merge bug10460 mysql-test/r/func_system.result: Merge bug10460 mysql-test/r/innodb_gis.result: Merge bug10460 mysql-test/r/ndb_gis.result: Merge bug10460
| * Bug#10460 SHOW CREATE TABLE uses inconsistent upper/lower caseunknown2006-02-2288-1571/+1571
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alter_table.result: Update test result mysql-test/r/analyse.result: Update test result mysql-test/r/archive.result: Update test result mysql-test/r/archive_bitfield.result: Update test result mysql-test/r/archive_gis.result: Update test result mysql-test/r/bdb.result: Update test result mysql-test/r/bdb_gis.result: Update test result mysql-test/r/bigint.result: Update test result mysql-test/r/binary.result: Update test result mysql-test/r/case.result: Update test result mysql-test/r/cast.result: Update test result mysql-test/r/constraints.result: Update test result mysql-test/r/create.result: Update test result mysql-test/r/ctype_collate.result: Update test result mysql-test/r/ctype_create.result: Update test result mysql-test/r/ctype_latin1_de.result: Update test result mysql-test/r/ctype_many.result: Update test result mysql-test/r/ctype_mb.result: Update test result mysql-test/r/ctype_recoding.result: Update test result mysql-test/r/ctype_sjis.result: Update test result mysql-test/r/ctype_tis620.result: Update test result mysql-test/r/ctype_ucs.result: Update test result mysql-test/r/ctype_ujis.result: Update test result mysql-test/r/ctype_utf8.result: Update test result mysql-test/r/default.result: Update test result mysql-test/r/events.result: Update test result mysql-test/r/federated.result: Update test result mysql-test/r/fulltext.result: Update test result mysql-test/r/func_gconcat.result: Update test result mysql-test/r/func_group.result: Update test result mysql-test/r/func_math.result: Update test result mysql-test/r/func_misc.result: Update test result mysql-test/r/func_str.result: Update test result mysql-test/r/func_system.result: Update test result mysql-test/r/gis-rtree.result: Update test result mysql-test/r/heap.result: Update test result mysql-test/r/index_merge_innodb.result: Update test result mysql-test/r/information_schema.result: Update test result mysql-test/r/innodb.result: Update test result mysql-test/r/innodb_gis.result: Update test result mysql-test/r/key.result: Update test result mysql-test/r/merge.result: Update test result mysql-test/r/myisam.result: Update test result mysql-test/r/mysqldump-max.result: Update test result mysql-test/r/mysqldump.result: Update test result mysql-test/r/ndb_bitfield.result: Update test result mysql-test/r/ndb_gis.result: Update test result mysql-test/r/ndb_partition_key.result: Update test result mysql-test/r/null.result: Update test result mysql-test/r/partition.result: Update test result mysql-test/r/partition_02myisam.result: Update test result mysql-test/r/partition_mgm_err.result: Update test result mysql-test/r/partition_range.result: Update test result mysql-test/r/ps_2myisam.result: Update test result mysql-test/r/ps_3innodb.result: Update test result mysql-test/r/ps_4heap.result: Update test result mysql-test/r/ps_5merge.result: Update test result mysql-test/r/ps_6bdb.result: Update test result mysql-test/r/rpl_mixed_ddl_dml.result: Update test result mysql-test/r/rpl_multi_engine.result: Update test result mysql-test/r/rpl_ndb_UUID.result: Update test result mysql-test/r/show_check.result: Update test result mysql-test/r/sp-vars.result: Update test result mysql-test/r/sp.result: Update test result mysql-test/r/sql_mode.result: Update test result mysql-test/r/strict.result: Update test result mysql-test/r/subselect.result: Update test result mysql-test/r/symlink.result: Update test result mysql-test/r/synchronization.result: Update test result mysql-test/r/system_mysql_db.result: Update test result mysql-test/r/temp_table.result: Update test result mysql-test/r/trigger.result: Update test result mysql-test/r/type_binary.result: Update test result mysql-test/r/type_bit.result: Update test result mysql-test/r/type_bit_innodb.result: Update test result mysql-test/r/type_blob.result: Update test result mysql-test/r/type_decimal.result: Update test result mysql-test/r/type_enum.result: Update test result mysql-test/r/type_float.result: Update test result mysql-test/r/type_nchar.result: Update test result mysql-test/r/type_newdecimal.result: Update test result mysql-test/r/type_set.result: Update test result mysql-test/r/type_timestamp.result: Update test result mysql-test/r/type_varchar.result: Update test result mysql-test/r/union.result: Update test result mysql-test/r/user_var.result: Update test result mysql-test/r/variables.result: Update test result sql/sql_show.cc: Make ouput from SHOW CREATE TABLE use uppercase for "CHARACTER SET", "COLLATE", "DEFAULT", "ON UPDATE" and "AUTO_INCREMENT"
* | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-03-037-206/+174
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/t/grant2.test: Auto merged
| * \ Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-03-033-1/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| * \ \ Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-03-039-208/+177
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 mysql-test/mysql-test-run.pl: Auto merged
| | * | | Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2unknown2006-03-036-205/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix for ndb_gis to run with all types of logging mysql-test/include/gis_generic.inc: Make the test tables for gis have a primary key with auto increment mysql-test/r/archive_gis.result: Update test result mysql-test/r/bdb_gis.result: Update test result mysql-test/r/innodb_gis.result: Update test result mysql-test/r/ndb_gis.result: Update test result mysql-test/t/ndb_gis.test: Remove the requirement to only run thiswhen binlog format is row.
| | * | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-03-023-3/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/t/grant2.test: Auto merged sql/sql_acl.cc: Auto merged
| | | * \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-03-013-6/+28
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| | | | * | | Bug#17279 user with no global privs and with create priv in db can create ↵unknown2006-03-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database - Fix test case for systems with "lowercase names" mysql-test/r/grant2.result: Update test result mysql-test/t/grant2.test: Fix for system with "lowercase names", allow erro 1007 to be returned
| | | * | | | Bug#17368 General log and slow query log don't workunknown2006-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add "storage/csv" to directories to be copied scripts/make_win_src_distribution.sh: Add "storage/csv" to directories to be copied(removed duplicated storage/example)
| | | * | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-03-014-2/+61
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 mysql-test/mysql-test-run.pl: Auto merged sql/sql_acl.cc: Auto merged
* | | | \ \ \ \ Merge mysql.com:/extern/mysql/bk/mysql-5.1-newunknown2006-03-033-1/+26
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
| * | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-03-033-1/+26
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b16316
| | * | | | | | Bug#16316: XML: extractvalue() is case-sensitive with contains()unknown2006-03-023-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xml.result, xml.test: Adding test case. item_xmlfunc.cc: Fixed that Item_nodeset_func derived classes didn't take into account charset of the XML value and always worked using "binary" charset. sql/item_xmlfunc.cc: Bug#16316: XML: extractvalue() is case-sensitive with contains() Fixed that Item_nodeset_func derived classes didn't take into account charset of the XML value and always worked using "binary" charset. mysql-test/t/xml.test: Adding test case. mysql-test/r/xml.result: Adding test case.
* | | | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.1-newunknown2006-03-0322-45/+463
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
| * | | | | | | Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0unknown2006-03-0322-45/+463
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/grant2.test: Auto merged mysql-test/t/skip_grants.test: Auto merged mysql-test/t/sp.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field_conv.cc: Auto merged sql/item.h: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_udf.cc: Auto merged VC++Files/mysql.sln: Manual merge (use local). configure.in: Manual merge. sql/table.cc: Manual merge.
| | * | | | | | | Expanding a binary field should result in 0x00-filled positions, not 0x20 unknown2006-03-023-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ASCII space). For Bug#16857. sql/field_conv.cc: Bug#16857: Do not expand BINARY fields as if they are strings (which presumably /should/ be filled with spaces). Instead, fill BINARY fields with 0x00 bytes.
| | * | | | | | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-026-83/+390
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#17595-mysql-5.0
| | | * | | | | | | Postfix for #17595. few lines in a test were accidentally commented.unknown2006-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments removed.
| | | * | | | | | | project files update for win32 buildunknown2006-02-273-83/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/mysql.sln: gen_lex_hash.vcproj is added into mysql.sln for win32 build. VC++Files/sql/gen_lex_hash.dsp: gen_lex_hash project file is added for win32 build. VC++Files/sql/gen_lex_hash.vcproj: gen_lex_hash project file is added for win32 build.
| | | * | | | | | | Fixes bug #17595. UDFs are not initialized when running mysqld with unknown2006-02-273-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --skip-grant-tables. However when deleting functions UDFs list was checked regardless of whther UDFs are initialized or not. Additional check is added into free_udf() and find_udf() functions to prevent possible runtime errors. mysql-test/r/skip_grants.result: Test result for #17595 patch. mysql-test/t/skip_grants.test: Test for #17595 patch.
| | * | | | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0unknown2006-03-024-4/+54
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
| | | * | | | | | | | Fixed BUG#17476: Stored procedure not returning data when it is called firstunknown2006-03-024-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time per connection Removed const_string() method from Item_string (it was only used in one place, in a bad way). Defer possible SP variable, and access data directly instead, in date_format item. mysql-test/r/sp.result: Updated results for new test (BUG#17476). mysql-test/t/sp.test: New test case (BUG#17476) sql/item.h: Removed const_string() from Item_string. It was only used in one place, and we can just use str_value in Item directly. sql/item_timefunc.cc: Must defer a (possible) local SP variable to use max_length and str_value in Item_func_date_format::fix_length_and_dec(), and refer to str_value directly without the const_string() method (now removed); the cast didn't work in all cases anyway.
| | * | | | | | | | | configure.in:unknown2006-03-021-2/+2
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloned configure.in: cloned
| | * | | | | | | | Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0unknown2006-03-023-3/+4
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-023-3/+4
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M50/mysql-5.0
| | | | * | | | | | | | Bug#17279 user with no global privs and with create priv in db can createunknown2006-03-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database - Fix test case for systems with "lowercase names" mysql-test/r/grant2.result: Fix for system with "lowercase names", allow error 1007 to be returned mysql-test/t/grant2.test: Fix for system with "lowercase names", allow error 1007 to be returned
| | | | * | | | | | | | Make the define start at "start of line"unknown2006-03-021-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0unknown2006-03-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.sh: Auto merged scripts/make_binary_distribution.sh: Auto merged
| | | * | | | | | | | | Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1unknown2006-03-021-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: Auto merged
| | | | * \ \ \ \ \ \ \ \ Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0unknown2006-03-012-25/+45
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
| | | | * \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2006-03-011-0/+7
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M40/comment-4.0
| | | * | \ \ \ \ \ \ \ \ \ \ Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1unknown2006-03-012-34/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 mysql-test/README: SCCS merged
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173unknown2006-03-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 mysql-test/README: Auto merged
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-012-0/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/comment-4.1 mysql-test/mysql-test-run.sh: Auto merged
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-0215-70/+150
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M50/mysql-5.0 mysql-test/mysql-test-run.sh: Auto merged
| | | * | | | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-024-3/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.9088
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0unknown2006-03-024-3/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.9088
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478unknown2006-03-011-27/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | | * | | | | | | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173unknown2006-03-011-27/+33
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 mysql-test/README: Auto merged
| | | | | * | | | | | | | | | | | | | | README:unknown2006-03-011-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revise README. mysql-test/README: revise README.
| | | * | | | | | | | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478unknown2006-03-011-7/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | | * | | | | | | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173unknown2006-03-011-7/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
| | | | | * | | | | | | | | | | | | | | README.gcov:unknown2006-03-011-7/+9
| | | | | | |_|_|_|/ / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise README.gcov. mysql-test/README.gcov: Revise README.gcov.
| | | * | | | | | | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478unknown2006-03-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / / | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
| | | | * | | | | | | | | | | | | | Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173unknown2006-03-010-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | | | | / / / / / / / / / / / | | | | | |_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478 mysql-test/README: Auto merged
| | | | | * | | | | | | | | | | | README:unknown2006-03-011-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise mysql-test README. mysql-test/README: Revise mysql-test README.
| | | * | | | | | | | | | | | | | Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virginunknown2006-03-013-2/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-virginunknown2006-03-013-2/+28
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/timka/mysql/src/5.0-virginunknown2006-03-013-2/+28
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/5.0-bug-17523