Commits · 11b8c529ccbf2ed9d82a9c3bf26bb9c2c851893f · nexedi / MariaDB

07 Feb, 2008 6 commits

Bug#34225: suite/parts test failure · 11b8c529

unknown authored Feb 07, 2008

Pre push fix:
added --sorted_result for consistent results


mysql-test/suite/parts/inc/partition_bit.inc:
  Bug#34225: suite/parts test failure
  
  added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_innodb.result:
  Bug#34225: suite/parts test failure
  
  added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_myisam.result:
  Bug#34225: suite/parts test failure
  
  added --sorted_result for consistent results

11b8c529

Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug33379 · 1a6789fd

unknown authored Feb 07, 2008

into  witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush


mysql-test/r/partition_datatype.result:
  Auto merged
mysql-test/t/partition_datatype.test:
  Auto merged

1a6789fd

Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug34225 · cc9e2ad2
unknown authored Feb 07, 2008
```
into  witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
```
cc9e2ad2
Merge witty.ndb.mysql.com:/Users/mattiasj/Public/shared-vms/mysql-5.1-bug33379 · 58a25342
unknown authored Feb 07, 2008
```
into  witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
```
58a25342

Bug#34358: Cannot find specified bit row in partitioned table · 1c0bd60d

unknown authored Feb 07, 2008

Problem was incorrect data length in the key_restore function
resulting in overwriting the search key.

Solution, remove one byte in length if uneven bits are used.


mysql-test/r/partition_datatype.result:
  Bug#34358: Cannot find specified bit row
  
  Updated result file
mysql-test/t/partition_datatype.test:
  Bug#34358: Cannot find specified bit row
  
  Updated test file
  (corrected a few errors and added a test case for the bug)
sql/key.cc:
  Bug34358: error in key_restore for bit fields with uneven bits
  
  When uneven bits exist, it has special treatment for the uneven bits
  but does use the same byte again when copying the rest of
  the key_part.

1c0bd60d

Bug#33379: valgrind error in parts/partition_bit_myisam · b2f0ed63

unknown authored Feb 07, 2008

Problem was that Field_bit used Field::hash() function that did not
know about using null-byte for storing bits.
Resulting in wrong length, which was caught by valgrind.

Solution: created a Field_bit::hash() that uses Field_bit::val_int()
and my_charset_bin-collation function hash_sort.
Also use the store function for platform independs


mysql-test/r/partition_datatype.result:
  Bug#33379: valgrind error in parts/partition_bit_myisam
  
  result file
  
  enabled bit datatype test
mysql-test/t/partition_datatype.test:
  Bug#33379: valgrind error in parts/partition_bit_myisam
  
  test file
  
  enabled bit datatype test
sql/field.cc:
  Bug#33379: valgrind error in parts/partition_bit_myisam
  
  Problem was that Field_bit used Field::hash() function that did not
  know about using null-byte for storing bits.
  Resulting in wrong length.
  
  Solution: created a Field_bit::hash() that uses Field_bit::val_int()
  and my_charset_bin-collation function hash_sort.
  Also use the store function for platform independens.
sql/field.h:
  Bug#33379: valgrind error in parts/partition_bit_myisam
  
  Problem was that Field_bit used Field::hash() function that did not
  know about using null-byte for storing bits.
  Resulting in wrong length.
  
  Solution: created a Field_bit::hash().

b2f0ed63

06 Feb, 2008 1 commit

Bug#34225: test suit parts uses /tmp-dir · 2bac240c

unknown authored Feb 06, 2008

Since it used /tmp-dir, it continues to fail on the same server
until the /tmp-dir is cleaned. (Another problem was that it
uses DATA/INDEX DIR without checking for symlink, which is needed)


Solution:
Moved all DATA/INDEX DIR test to a new partition_basic_symlink.inc file
and use this for myisam and innodb, also requiring symlinks and
not_windows.
(i.e. removed DATA/INDEX DIR use from several tests)


mysql-test/suite/parts/inc/partition_basic.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_bigint.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_binary.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_bit.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_blob.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_char.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_date.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_datetime.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_decimal.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_double.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_enum.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_float.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_int.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_16col.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_32col.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_4col.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_8col.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_mediumint.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_set.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_smallint.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_text.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_time.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_timestamp.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_tinyint.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_varbinary.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_varchar.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_year.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_bit_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_bit_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_char_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_char_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_datetime_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_datetime_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_decimal_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_decimal_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_float_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_float_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_int_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_int_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_special_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/r/partition_special_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/t/partition_sessions.test:
  Bug#34225: test suit parts uses /tmp-dir
  
  Removed the DATA/INDEX DIR, since the test is not dependent of it
  (adding "--source include/have_symlink.inc" would have disabled it
  on some platforms/configurations)
mysql-test/suite/parts/inc/partition_basic_symlink.inc:
  Bug#34225: test suit parts uses /tmp-dir
  
  Added this test case for testing some DATA/INDEX DIRECTORY cases
  since I removed so much of it from all other tests.
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Added this test case for testing some DATA/INDEX DIRECTORY cases
  since I removed so much of it from all other tests.
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
  Bug#34225: test suit parts uses /tmp-dir
  
  Added this test case for testing some DATA/INDEX DIRECTORY cases
  since I removed so much of it from all other tests.
mysql-test/suite/parts/t/partition_basic_symlink_innodb.test:
  Bug#34225: test suit parts uses /tmp-dir
  
  Added this test case for testing some DATA/INDEX DIRECTORY cases
  since I removed so much of it from all other tests.
mysql-test/suite/parts/t/partition_basic_symlink_myisam.test:
  Bug#34225: test suit parts uses /tmp-dir
  
  Added this test case for testing some DATA/INDEX DIRECTORY cases
  since I removed so much of it from all other tests.

2bac240c

31 Jan, 2008 3 commits

Merge mysql.com:/home/svoj/devel/mysql/BUG22989/mysql-5.0-engines · 629b355b
unknown authored Jan 31, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG22989/mysql-5.1-engines


sql/repl_failsafe.cc:
  Auto merged
```
629b355b

BUG#22989 - START SLAVE causes Error on COM_REGISTER_SLAVE: 1105 · 5177c97e

unknown authored Jan 31, 2008

            'Wrong parameters to functi

START SLAVE reports vague error when it fails to register on master:
"Wrong parameters to function register_slave".

If master failed to register slave because of too long
'report-host'/'report-user'/'report-password', return better error
messages:
"Failed to register slave: too long 'report-host'"
"Failed to register slave: too long 'report-user'"
"Failed to register slave; too long 'report-password'"

No test case for this fix.


sql/repl_failsafe.cc:
  Report descriptive error when master fails to register slave.

5177c97e

Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug30459 · 0f41efed
unknown authored Jan 31, 2008
```
into  witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-topush
```
0f41efed

30 Jan, 2008 1 commit

BUG#33871 - Duplicate "would" in Fulltext Stopwords · 324d5417

unknown authored Jan 30, 2008

Code cleanup: removed duplicate stopword.


storage/myisam/ft_static.c:
  Code cleanup: removed duplicate stopword.

324d5417

29 Jan, 2008 4 commits

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 1d19baaa
unknown authored Jan 29, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
1d19baaa

Merge stella.local:/home2/mydev/mysql-5.1-amain · 5ef1a2a0

unknown authored Jan 29, 2008

into  stella.local:/home2/mydev/mysql-5.1-axmrg


sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged

5ef1a2a0

Merge stella.local:/home2/mydev/mysql-5.0-amain · a46b9639
unknown authored Jan 29, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
a46b9639
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 97c4bc82
unknown authored Jan 29, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG26978/mysql-5.1-engines
```
97c4bc82

27 Jan, 2008 2 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 4bacd537

unknown authored Jan 27, 2008

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/r/mysqlcheck.result:
  Use local (manual merge)
mysql-test/t/mysqlcheck.test:
  Use local (manual merge)

4bacd537

Fix test case for Bug #25347 so that it actually tests the code fix, · 32f59206

unknown authored Jan 27, 2008

and so that it works correctly on Windows.


mysql-test/r/mysqlcheck.result:
  Flush tables before monkeying around with underlying MyISAM data files
mysql-test/t/mysqlcheck.test:
  Fix the test case for bug #25347 so that it actually does test the behavior.
  Also, this makes it work on Windows by ensuring that mysqld doesn't hold the
  underlying MyISAM files open while we try to corrupt them on disk.
  
  Flush tables before monkeying around with underlying MyISAM data files;
  --use-frm, so that mysqlcheck will succeed.

32f59206

26 Jan, 2008 4 commits

Merge xiphis.org:/anubis/antony/work/bug33358.2 · b2d65369
unknown authored Jan 26, 2008
```
into  xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
```
b2d65369

fixes to make pushbuild tests green · 70884e09

unknown authored Jan 26, 2008


mysql-test/t/plugin_load-master.opt:
  add '--loose' modifier to allow test to be skipped if plugin is not available.
sql/sql_plugin.cc:
  Failure to load a plugin from command line option made non-fatal as plugin
  load failures from plugin table is already non-fatal.

70884e09

Merge xiphis.org:/anubis/antony/work/bug33358.2 · f9064eb0
unknown authored Jan 25, 2008
```
into  xiphis.org:/anubis/antony/work/bug33358.2-merge-5.1
```
f9064eb0

Bug#33358 · f1042103

unknown authored Jan 25, 2008

  "Plugin enum variables can't be set from command line"
  fix crash of LOCK_plugins mutex when loading plug-ins from command line.
  fix off-by-one bug when loading multiple plug-ins from the command line.
  initialize command line handling for ENUM and SET plugin variable types.


sql/sql_plugin.cc:
  Bug33358
    fix crash of LOCK_plugins mutex when loading plug-ins from command line.
    fix off-by-one bug when loading multiple plug-ins from the command line.
    initialize command line handling for ENUM and SET plugin variable types.
mysql-test/r/plugin_load.result:
  New BitKeeper file ``mysql-test/r/plugin_load.result''
mysql-test/t/plugin_load-master.opt:
  New BitKeeper file ``mysql-test/t/plugin_load-master.opt''
mysql-test/t/plugin_load.test:
  New BitKeeper file ``mysql-test/t/plugin_load.test''

f1042103

25 Jan, 2008 5 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 8b314591

unknown authored Jan 25, 2008

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/t/mysqlcheck.test:
  Manual merge

8b314591

Un-break test case on Windows, for bug #25347 · 9dbd3877

unknown authored Jan 25, 2008


mysql-test/t/mysqlcheck.test:
  Use --remove_file and --write_file instead of --exec rm and --exec touch.

9dbd3877

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · aa4f8572
unknown authored Jan 25, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_select.cc:
  Auto merged
```
aa4f8572

Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · bf541d14

unknown authored Jan 25, 2008

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/handler.cc:
  Manual merge
sql/item.cc:
  Manual merge

bf541d14

Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 893d98fb
unknown authored Jan 25, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/sql_select.cc:
  Auto merged
```
893d98fb

24 Jan, 2008 10 commits

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 1353b9d0
unknown authored Jan 24, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
1353b9d0
Merge stella.local:/home2/mydev/mysql-5.1-bug29182 · a48c9bcf
unknown authored Jan 24, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
a48c9bcf
Merge stella.local:/home2/mydev/mysql-5.1-amain · 6d80b701
unknown authored Jan 24, 2008
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
6d80b701
Merge stella.local:/home2/mydev/mysql-5.0-amain · 6daa27b1
unknown authored Jan 24, 2008
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
6daa27b1

Bug#29182 - MyISAMCHK reports wrong character set · 1804046d

unknown authored Jan 24, 2008

myisamchk did always show Character set: latin1_swedish_ci (8),
regardless what DEFAULT CHARSET the table had.

When the server created a MyISAM table, it did not copy the
characterset number into the MyISAM create info structure.

Added assignment of charset number to MI_CREATE_INFO.


mysql-test/r/myisam.result:
  Bug#29182 - MyISAMCHK reports wrong character set
  Added test result.
mysql-test/t/myisam.test:
  Bug#29182 - MyISAMCHK reports wrong character set
  Added test.
storage/myisam/ha_myisam.cc:
  Bug#29182 - MyISAMCHK reports wrong character set
  Added assignment of charset number to MI_CREATE_INFO.

1804046d

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 4a113c64
unknown authored Jan 24, 2008
```
into  mysql.com:/home/svoj/devel/mysql/BUG28884/mysql-5.1-engines
```
4a113c64
Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt · 8f9e655d
unknown authored Jan 24, 2008
```
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
```
8f9e655d

Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 · 5785aba2

unknown authored Jan 24, 2008

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

5785aba2

Merge quad.:/mnt/raid/alik/MySQL/devel/5.0 · a89ba0c6
unknown authored Jan 24, 2008
```
into  quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged-5.0
```
a89ba0c6
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1 · f23b19ea
unknown authored Jan 24, 2008
```
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
```
f23b19ea

23 Jan, 2008 4 commits

Manual merge · e63a0501
unknown authored Jan 23, 2008

e63a0501

Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618 · 9d96bb98

unknown authored Jan 23, 2008

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618


mysql-test/r/sp-code.result:
  Auto merged
mysql-test/t/sp-code.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged

9d96bb98

manual merge · 8430df5a
unknown authored Jan 23, 2008

8430df5a

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · e7b65baa

unknown authored Jan 23, 2008

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618


mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

e7b65baa