Commits · a7489ed189cdb05cc3d021a20c18ba122d889d02 · nexedi / MariaDB

04 Jul, 2007 6 commits

Many tests have been moved to suite/*. Some tests have been removed. · a7489ed1

unknown authored Jul 04, 2007

Update the disabled.def files to reflect actual contents of the t/* directories.

Also, move a few more tests into suite/*.

mysql-test/suite/parts/t/rpl_partition.test:
Rename: mysql-test/t/rpl_partition.test -> mysql-test/suite/parts/t/rpl_partition.test
mysql-test/suite/parts/r/rpl_partition.result:
Rename: mysql-test/r/rpl_partition.result -> mysql-test/suite/parts/r/rpl_partition.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt:
Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test:
Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt:
Rename: mysql-test/t/rpl_ndb_mix_innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test:
Rename: mysql-test/t/rpl_ndb_mix_innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test
mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result:
Rename: mysql-test/r/rpl_ndb_ctype_ucs2_def.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result:
Rename: mysql-test/r/rpl_ndb_mix_innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result
mysql-test/suite/ndb/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/parts/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/rpl/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/rpl_ndb/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/t/disabled.def:
Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.

a7489ed1

Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 · 9e14ae94

unknown authored Jul 04, 2007

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


client/mysqldump.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_multi_engine.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_multi_engine.test:
  Auto merged
mysql-test/suite/ndb/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_sp.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_trigger.result:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_alter_table.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_alter_table2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_alter_table3.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover3.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_basic.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_binlog_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_bitfield.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_blob.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_blob_partition.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cache.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cache2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_charset.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_config.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_config2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cursor.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_database.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_alter.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_basic.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_ddl.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_dump.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_gis.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_index.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_index_ordered.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_index_unique.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_insert.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_limit.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_lock.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_minmax.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_partition_error.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_partition_key.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_partition_list.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_partition_range.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_read_multi_range.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_rename.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_replace.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore_partition.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore_print.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_row_format.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_sp.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_subquery.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_temporary.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_transaction.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_trigger.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_truncate.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_types.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_view.test:
  Auto merged
mysql-test/suite/ndb/t/ndbapi.test:
  Auto merged
mysql-test/suite/ndb/t/ps_7ndb.test:
  Auto merged
mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_replicate_do.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_UUID.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_trigger.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_view.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
  (Will need to follow up with moving a few test cases around post-merge)

9e14ae94

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 9838a1a9
unknown authored Jul 04, 2007
```
into  sita.local:/Users/tsmith/m/bk/maint/51
```
9838a1a9

rpl_misc_functions.result, rpl_misc_functions.test: · 793c1896

unknown authored Jul 04, 2007

  Remove indeterministic behavior from a test


mysql-test/suite/rpl/r/rpl_misc_functions.result:
  Remove indeterministic behavior from a test
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  Remove indeterministic behavior from a test

793c1896

Merge mysql.com:/home/ram/work/mysql-5.1-maint · 5b5ef176
unknown authored Jul 04, 2007
```
into  mysql.com:/home/ram/work/b19328/b19328.5.1
```
5b5ef176

rpl_misc_functions.result, rpl_misc_functions.test: · d7282f13

unknown authored Jul 03, 2007

work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup

mysql-test/suite/rpl/r/rpl_misc_functions.result:
work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
mysql-test/suite/rpl/t/rpl_misc_functions.test:
work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup

d7282f13

03 Jul, 2007 7 commits

Complementary fix for bug #29353: inserting a negative value to a csv table · b16b2683

unknown authored Jul 03, 2007

leads to the table corruption

New Field::store() method implemented to explicitly set thd->count_cuted_fields
before value storing, instead of (incorrectly) setting it in the CSV storage engine.
Thread row counter now properly incremented during check and repair in the CSV engine.


include/mysql/plugin.h:
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
    - thd_inc_row_count() function prototype added, which allows a storage 
      engine to increment thread row counter.
mysql-test/r/csv.result:
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
    - result adjusted.
sql/field.cc:
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
    - Field::store(const char *to, uint length, CHARSET_INFO *cs,
                   enum_check_fields check_level)
      method introduced in order to explicitly set count_cuted_fields before 
      a ::store call, then reset it back after.
sql/field.h:
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
    - Field::store(const char *to, uint length, CHARSET_INFO *cs,
                   enum_check_fields check_level)
      method introduced in order to explicitly set count_cuted_fields before 
      a ::store call, then reset it back after.
sql/mysql_priv.h:
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
    - enum enum_check_fields moved from sql/sql_class.h to sql/mysql_priv.h
      as it's used now in the field.h
sql/sql_class.cc:
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
    - implementation of the new thd_inc_row_count() function which increments
      thread row counter.
sql/sql_class.h:
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
    - enum enum_check_fields moved from sql/sql_class.h to sql/mysql_priv.h
      as it's used now in the field.h
storage/csv/ha_tina.cc:
  Complementary fix for bug #29353: inserting a negative value to a csv table 
  leads to the table corruption
    - removed #define MYSQL_SERVER 1 - "a storage engine should not need 
      internals of the server"
    - removed thd->count_cuted_fields= CHECK_FIELD_WARN as we are not allowed to 
      access internals of THD.
    - used new Field::store() method to explicitly set thd->count_cuted_fields to
      CHECK_FIELD_WARN
    - thd_inc_row_count() calls added to ha_tina::repair() and ha_tina::check()
      to get proper row count values.

b16b2683

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 48782e34

unknown authored Jul 03, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

48782e34

Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27345 · c45f8f94

unknown authored Jul 03, 2007

into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl


strings/ctype-uca.c:
  Auto merged
strings/ctype-mb.c:
  After merge fix.
strings/ctype-ucs2.c:
  After merge fix.

c45f8f94

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 7edcebc9
unknown authored Jul 03, 2007
```
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27345
```
7edcebc9

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · b5a61001

unknown authored Jul 03, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

b5a61001

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · fb349433

unknown authored Jul 03, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

fb349433

ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) · d55ca617

unknown authored Jul 03, 2007

  Not very clever fix for DIH incorrect REDO handling
  - Dont report GCP_SAVE_CONF until first LCP has been complete during NR


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Not very clever fix for DIH incorrect REDO handling
    - Dont report GCP_SAVE_CONF until first LCP has been complete during NR

d55ca617

02 Jul, 2007 18 commits

Merge amd64.(none):/src/bug24924/my50-bug24924 · d45d542a
unknown authored Jul 02, 2007
```
into  amd64.(none):/src/bug24924/my51-bug24924
```
d45d542a

Bug#24924 shared-memory-base-name that is too long causes buffer overflow · 416a49a6

unknown authored Jul 02, 2007

- Testcase fixup.


mysql-test/t/windows_shm.test:
  Bug#24924 shared-memory-base-name that is too long causes buffer overflow
  - Pass user, port and host to mysqladmin.

416a49a6

post-merge fix · 7119687e
unknown authored Jul 02, 2007

7119687e

Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl · 70a8f7ab

unknown authored Jul 02, 2007

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

70a8f7ab

Merge mysql.com:/nfsdisk1/lars/bk/mysql-4.1-rpl · e24a757a
unknown authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
```
e24a757a
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 · daf74b21
unknown authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


sql/sql_yacc.yy:
  Auto merged
```
daf74b21
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · c68336b1
unknown authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl


sql/sql_yacc.yy:
  Auto merged
```
c68336b1

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 766525d9

unknown authored Jul 02, 2007

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

766525d9

ndb - bug#29364 - port merge (5.0 -> 5.1) · 0095218a
unknown authored Jul 02, 2007

0095218a

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 0b4041f3

unknown authored Jul 02, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

0b4041f3

ndb - bug#29364 - "SQL queries hang while data node in start phase 5" · f83a63ad

unknown authored Jul 02, 2007

  In TC init node status for already started nodes during node restart
  (not present in 5.1)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  on node restart, make sure to init all already started nodes to NF_STARTED
ndb/test/ndbapi/testNodeRestart.cpp:
  test prg
ndb/test/run-test/daily-basic-tests.txt:
  test prg

f83a63ad

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · f00722b9

unknown authored Jul 02, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/my_base.h:
  Manual merge main->rpl 5.1
mysql-test/t/innodb.test:
  Manual merge main->rpl 5.1

f00722b9

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 2b09b6c5

unknown authored Jul 02, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

2b09b6c5

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · a00a7e80
unknown authored Jul 02, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
a00a7e80

Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 · e16bf735

unknown authored Jul 02, 2007

into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540


mysql-test/extra/binlog_tests/binlog.test:
  manual merge
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
  manual merge
sql/log.cc:
  manual merge

e16bf735

A post-merge fix. · 3fcaacea

unknown authored Jul 02, 2007


mysql-test/r/show_check.result:
  A post-merge fix (Bug#10491)

3fcaacea

Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB · 1063bf22

unknown authored Jul 02, 2007

minor fixes to appease pushbuild.
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540


mysql-test/extra/binlog_tests/binlog.test:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  make test portable so it will work on servers with
  funny names.
mysql-test/suite/binlog/r/binlog_row_binlog.result:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  make test portable so it will work on servers with
  funny names.
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  make test portable so it will work on servers with
  funny names.

1063bf22

Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB · 68e1f851

unknown authored Jul 02, 2007

minor fixes to appease pushbuild.


mysql-test/r/binlog.result:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  make test portable so it will work on servers with
  funny names.
mysql-test/t/binlog.test:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  make test portable so it will work on servers with
  funny names.
sql/log.cc:
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  change type to uchar * so it's the same as in 5.1.

68e1f851

01 Jul, 2007 9 commits

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 418996f3

unknown authored Jul 02, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

418996f3

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c182dfa2

unknown authored Jul 02, 2007

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

c182dfa2

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 58935a31

unknown authored Jul 02, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/show_check.result:
  Manual merge.
mysql-test/t/show_check.test:
  Manual merge.
sql/item.h:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

58935a31

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0852b369

unknown authored Jul 02, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/create.result:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

0852b369

Update a missed test result. · 2e81ee13

unknown authored Jul 02, 2007


mysql-test/r/ps_6bdb.result:
  Update test results (character sets patch).

2e81ee13

Corrected a test case. · de0ba5c8
unknown authored Jul 01, 2007

de0ba5c8
Made test case platform independent. · e63f6f32
unknown authored Jul 01, 2007

e63f6f32
Post-merge fix. · f9d36194
unknown authored Jun 30, 2007

f9d36194

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 26a2b004

unknown authored Jun 30, 2007

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt


mysql-test/r/binary.result:
  Auto merged
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/create.result:
  Manual merge.
mysql-test/r/subselect.result:
  Manual merge.
mysql-test/r/type_enum.result:
  Manual merge.
mysql-test/t/type_enum.test:
  Manual merge.
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
storage/myisam/mi_key.c:
  Manual merge.

26a2b004