- 08 Aug, 2006 2 commits
-
-
unknown authored
Review fixes mysql-test/r/partition.result: New test cases mysql-test/t/partition.test: New test cases sql/ha_partition.cc: Added comments after review + removed erroneus setting
-
unknown authored
Don't use get_auto_increment on tables without auto_increment fields mysql-test/r/partition.result: new test case mysql-test/t/partition.test: new test case sql/ha_partition.cc: Don't use get_auto_increment on tables without auto_increment fields
-
- 03 Aug, 2006 13 commits
-
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.1-clean
-
unknown authored
-
unknown authored
Use "--source" command instead of "source", makes mysql-test-run.pl dtecte this as test case that need binlog format row.
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c
-
unknown authored
-
unknown authored
sql/ha_federated.cc: After merge fix
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint sql/ha_federated.cc: Manual merge
-
unknown authored
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c mysql-test/t/warnings.test: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) sql/handler.cc: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) sql/mysql_priv.h: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) sql/mysqld.cc: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) sql/set_var.cc: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?) mysql-test/r/warnings.result: 5.0 -> 5.1 manual merge, part 3 of 3 (or more?)
-
unknown authored
into maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-b mysql-test/r/insert_select.result: SCCS merged sql/sql_insert.cc: SCCS merged
-
unknown authored
-
- 02 Aug, 2006 4 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: SCCS merged
-
unknown authored
-
unknown authored
into trift2.:/M51/merge-5.0-to-5.1 support-files/mysql.spec.sh: Null-merge, as 5.1 uses a different approach to testing.
-
unknown authored
- Remove the defines for strings and uses STRING_WITH_LEN directly when calling 'append' sql/ha_federated.cc: Remove the defines for strings and their lengths and use STRING_WITH_LEN directly when calling append(). sql/ha_federated.h: Remove the defines for strings and their lengths and use STRING_WITH_LEN directly when calling append().
-
- 01 Aug, 2006 17 commits
-
-
unknown authored
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql mysql-test/r/innodb.result: Auto merged
-
unknown authored
After merge fix sql/sql_view.cc: After merge fix
-
unknown authored
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql client/mysql.cc: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/view.test: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged sql/sql_view.cc: SCCS merged
-
unknown authored
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
-
unknown authored
After merge fix storage/ndb/test/ndbapi/Makefile.am: After merge fix
-
unknown authored
After merge fix mysql-test/r/func_str.result: After merge fix
-
unknown authored
-
unknown authored
into rakia.(none):/home/kgeorge/mysql/autopush/B20103-5.0-opt
-
unknown authored
- make the client to respect the server-side no_backslash_escapes option and disable the special meaning of backslash also at client side. mysql-test/r/mysql_client.result: Bug #20103: Escaping with backslash does not work - test case mysql-test/t/mysql_client.test: Bug #20103: Escaping with backslash does not work - test case
-
unknown authored
-Remove leftovers of server_stop and server_start commands client/mysqltest.c: Remove leftovers of "server_start" and "server_stop" commands
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged
-
unknown authored
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql mysql-test/r/auto_increment.result: Auto merged mysql-test/r/binlog_row_blackhole.result: Auto merged mysql-test/r/binlog_stm_blackhole.result: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/func_compress.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/func_system.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/group_min_max.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/olap.result: Auto merged mysql-test/r/partition_pruning.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/rpl_get_lock.result: Auto merged mysql-test/r/rpl_master_pos_wait.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/group_min_max.test: Auto merged mysql-test/t/partition_pruning.test: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.h: Auto merged
-
unknown authored
-
unknown authored
into rakia.(none):/home/kgeorge/mysql/autopush/B11551-5.0-opt
-
unknown authored
into sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge extra/yassl/src/ssl.cpp: Auto merged mysql-test/t/rpl_openssl.test: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
-
- 31 Jul, 2006 4 commits
-
-
unknown authored
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql mysql-test/r/func_group.result: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/select.result: SCCS merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge extra/yassl/src/ssl.cpp: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge extra/yassl/src/ssl.cpp: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
-