Commits · 314e6e2551a71d2f7e88941fcba782af2fe2ee3b · nexedi / MariaDB

18 May, 2008 1 commit

Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-bugteam · 314e6e25

unknown authored May 18, 2008

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


sql/handler.cc:
  Auto merged
configure.in:
  merge 5.0-bugteam to 5.1-bugteam

314e6e25

17 May, 2008 1 commit

Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on 64-bit wondo. · f197f3ab

unknown authored May 17, 2008

temporary variables of 'long' types were used to store ulong values,
that causes init_key_cache to receive distorted parameters

sql/handler.cc:
Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on 64-bit wondo.

types of temporary variables changed to match init_key_cache() parameters

f197f3ab

16 May, 2008 24 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam · eee5b972
unknown authored May 16, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam
```
eee5b972
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570 · 290b6c00
unknown authored May 16, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam
```
290b6c00
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570 · 85cabe0b
unknown authored May 16, 2008
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-bugteam
```
85cabe0b

subselect.result: · 747d881b

unknown authored May 16, 2008

  updated the testcase for bug 36011


mysql-test/r/subselect.result:
  updated the testcase for bug 36011

747d881b

Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam · 277e783d

unknown authored May 16, 2008

into  magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam


sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  merge of bug 36011 to 5.1-bugteam
mysql-test/t/subselect.test:
  merge of bug 36011 to 5.1-bugteam

277e783d

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam · 97354b19
unknown authored May 16, 2008
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B36011-take2-5.0-bugteam
```
97354b19
Re-record results from unmerged file. · 7b35af4a
unknown authored May 16, 2008

7b35af4a

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570 · 3618df73

unknown authored May 16, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570


mysql-test/suite/rpl/t/rpl_sp.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Use local.  Needs re-recording.

3618df73

Fix merge problems and re-record output for legitimate changes. · 7d53cbc3

unknown authored May 16, 2008


mysql-test/r/ctype_cp932_binlog_stm.result:
  New offsets because of quote marks.
mysql-test/r/mysqlbinlog.result:
  Re-add variables removed in merge at file-vers 1.47.
mysql-test/suite/binlog/r/binlog_database.result:
  create_string() output changes the quoting and inserts newlines.
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
  Change in quoting.
mysql-test/suite/rpl/r/rpl_sp.result:
  Adds quotes and newlines in creation of routines in binlog.

7d53cbc3

Add a test at Andrei's behest. Show the SHOW CREATE on the · 1f904b7f

unknown authored May 16, 2008

master also, so that we can visually see the slave is the same.


mysql-test/r/rpl_sp.result:
  SHOW CREATE on master also.
mysql-test/t/rpl_sp.test:
  SHOW CREATE on master also.

1f904b7f

Merge mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam · db84d000
unknown authored May 16, 2008
```
into  mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
```
db84d000

Fixes to make rpl_insert_id pass in 5.1-bugteam. · 65677ea5

unknown authored May 16, 2008


mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Moving save and restore of @@global.concurrent_insert into the same
  session thread.
mysql-test/suite/rpl/r/rpl_insert_id.result:
  Result file change.
mysql-test/suite/rpl/t/rpl_insert_id.test:
  ***MISSING TEXT***

65677ea5

Bug #36011: server crash with explain extended on query · 0fb1527e

unknown authored May 16, 2008

   with dependent subqueries
An IN subquery is executed on EXPLAIN when it's not correlated.
If the subquery required a temporary table for its execution
not all the internal structures were restored from pointing to
the items of the temporary table to point back to the items of
the subquery.
Fixed by restoring the ref array when a temp tables were used in
executing the IN subquery during EXPLAIN EXTENDED.


mysql-test/r/subselect.result:
  Bug #36011: test case
mysql-test/t/subselect.test:
  Bug #36011: test case
sql/sql_select.cc:
  Bug #36011: restore the ref array after execution 
  when there were temp tables.

0fb1527e

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 21b8d8b5
unknown authored May 16, 2008
```
into  mysql.com:/Users/davi/mysql/mysql-5.0-bugteam
```
21b8d8b5
Merge mysql.com:/Users/davi/mysql/mysql-5.0-bugteam · f72dc6fe
unknown authored May 16, 2008
```
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
```
f72dc6fe

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570 · 7b79348e

unknown authored May 16, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570


mysql-test/suite/rpl/t/rpl_sp.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  manual merge.

7b79348e

Updated to address Davi's complaint about missing binlog. · e1095727

unknown authored May 16, 2008


mysql-test/r/rpl_sp.result:
  Add binlog results to show that they're written correctly.
mysql-test/t/rpl_sp.test:
  Add binlog results to show that they're written correctly.

e1095727

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 9cbcf5a8
unknown authored May 16, 2008
```
into  mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam
```
9cbcf5a8
Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam · 6f914937
unknown authored May 16, 2008
```
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744
```
6f914937
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 3d0ca97c
unknown authored May 16, 2008
```
into  mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam
```
3d0ca97c
Raise version number after cloning 5.0.62 · b2fe762e
unknown authored May 16, 2008

b2fe762e
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam · 9397cbb8
unknown authored May 16, 2008
```
into  mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam
```
9397cbb8
Merge host.loc:/work/bugs/5.0-bugteam-36488 · 7ca1538b
unknown authored May 16, 2008
```
into  host.loc:/work/bk/5.0-bugteam
```
7ca1538b
Merge host.loc:/work/bugs/5.0-bugteam-36488 · 09de24ec
unknown authored May 16, 2008
```
into  host.loc:/work/bk/5.1-bugteam


sql/item_strfunc.cc:
  Auto merged
```
09de24ec

15 May, 2008 11 commits

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570 · 99061383

unknown authored May 15, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570


BitKeeper/deleted/.del-binlog_innodb.result:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  need to re-record.
mysql-test/suite/rpl/r/rpl_sp.result:
  need to re-record.
mysql-test/r/mysqlbinlog.result:
  manual merge.
mysql-test/suite/rpl/t/rpl_sp.test:
  manual merge.
sql/sp.cc:
  manual merge.
sql/sp_head.h:
  manual merge.

99061383

Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam · 8eaa55fb
unknown authored May 15, 2008
```
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744
```
8eaa55fb

Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \ · 55012e42

unknown authored May 15, 2008

	slave

The stored-routine code took the contents of the (lowest) parser
and copied it directly to the binlog, which causes problems if there
is a special case of interpretation at the parser level -- which 
there is, in the "/*!VER */" comments.  The trailing "*/" caused
errors on the slave, naturally.

Now, since by that point we have /properly/ created parse-tree (as 
the rest of the server should do!) for the stored-routine CREATE, we
can construct a perfect statement from that information, instead of
writing uncertain information from an unknown parser state.  
Fortunately, there's already a function nearby that does exactly 
that.
---
Update for Bug#36570.  Qualify routine names with db name when
writing to the binlog ONLY if the source text is qualified.


mysql-test/r/binlog_innodb.result:
  Offsets changed due to quoting.
  ---
  New offset to account for db-qualified names.
mysql-test/r/ctype_cp932_binlog.result:
  Offsets changed due to quoting.
  ---
  Qualify routine names with DB.  Offsets change also.
mysql-test/r/mysqlbinlog.result:
  Case changed in result due to interpretation of data instead of 
  literal recitation.
  ---
  Qualify procedure name with db.
mysql-test/r/rpl_sp.result:
  Offsets changed due to quoting.  Added tests.
  ---
  Qualify routine names with DB if qualified in query.  Offsets change also.
mysql-test/t/rpl_sp.test:
  Add version-limiting quotes to exercise bug#36570.  Test that 
  backtick-quoted identifiers and labels work also.
  ---
  Use different db to show qualification works.  Qualify routine names
  with DB if qualified in query.
sql/sp.cc:
  In create_string, we may not have a sp_name parameter yet, so
  instead pass the char* and length of the only member we'd get out
  of it.
  
  Having done that, we can use the same function to write the 
  CREATE (FUNC|TRIG|PROC) statement to the binlog as we always used
  to display the statement to the user.
  ---
  Make the db name part of the CREATE string if it is specified.
  
  Specify it in part of writing to the binlog when creating a new
  routine.
sql/sp_head.cc:
  Set the sp_head m_explicit_name member as the sp_name member is set.  
  We can not peek at this later, as the sp_name is gone by then.
sql/sp_head.h:
  Add a member to track whether the name is qualified with the 
  database.

55012e42

Merge riska.(none):/home/sven/bkroot/5.1-bugteam · 19e1bc76
unknown authored May 15, 2008
```
into  riska.(none):/home/sven/bk/b36433-rpl_insert_id/5.1-bugteam
```
19e1bc76
Merge mats-laptop.(none):/home/bkroot/mysql-5.1-bugteam · 439cbe54
unknown authored May 15, 2008
```
into  mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
```
439cbe54
Merge five.local.lan:/work/merge/mysql-5.1-bugteam-newjp · 6a6ec902
unknown authored May 15, 2008
```
into  five.local.lan:/work/trees/mysql-5.1-bugteam-src-clean
```
6a6ec902
Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5.1-bugteam · 341f9ab2
unknown authored May 15, 2008
```
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/test_fix/mysql-5.1-bugteam_35744
```
341f9ab2

Fix for · 7ab1c8dc

unknown authored May 15, 2008

  Bug#28563 Test suite "jp" fails completely
- The main goal of this fix is to make the "jp" suite runnable in general
  and to make it more robust for use in pushbuild under build team conditions.
- It was decided to fix the remaining heavy issues within the
  architecture of this test later
  (-> WL 4327 Redesign the 'jp' testsuite for build team testing conditions)
  Only the test jp_trim_sjis got some significant improvements of its
  architecture (Just as proof of concept for the other tests).
- Tests suffering from
     Bug 36597 Testsuite "jp": Suspicious results for some tests
               (unexpected result sets)
  were disabled
- *.opt files were used to avoid differences on OS (Windows) because of
  case sensitive tablenames within the tests  


mysql-test/suite/jp/r/jp_alter_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_alter_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_alter_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_alter_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_charlength_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_charlength_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_charlength_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_charlength_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_charset_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_charset_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_charset_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_charset_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_convert_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_convert_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_convert_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_convert_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_create_db_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_create_db_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_create_db_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_create_db_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_create_tbl_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_create_tbl_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_create_tbl_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_create_tbl_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_enum_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_enum_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_enum_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_enum_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_insert_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_insert_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_insert_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_insert_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_instr_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_instr_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_instr_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_instr_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_join_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_join_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_join_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_join_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_left_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_left_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_left_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_left_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_length_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_length_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_length_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_length_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_like_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_like_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_like_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_like_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_locate_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_locate_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_locate_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_locate_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_lpad_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_lpad_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_lpad_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_lpad_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_ltrim_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_ltrim_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_ltrim_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_ltrim_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_ps_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_ps_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_replace_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_replace_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_replace_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_replace_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_reverse_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_reverse_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_reverse_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_reverse_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_right_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_right_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_right_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_right_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_rpad_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_rpad_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_rpad_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_rpad_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_rtrim_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_rtrim_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_rtrim_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_rtrim_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_select_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_select_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_select_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_select_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_subquery_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_subquery_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_subquery_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_subquery_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_substring_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_substring_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_substring_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_substring_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_trim_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_trim_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_trim_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_trim_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_union_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_update_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_update_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_update_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_update_utf8.result:
  Updated results
mysql-test/suite/jp/r/jp_where_sjis.result:
  Updated results
mysql-test/suite/jp/r/jp_where_ucs2.result:
  Updated results
mysql-test/suite/jp/r/jp_where_ujis.result:
  Updated results
mysql-test/suite/jp/r/jp_where_utf8.result:
  Updated results
mysql-test/suite/jp/t/jp_alter_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_alter_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_alter_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_alter_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_charlength_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_charlength_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_charlength_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_charlength_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_charset_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_charset_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_charset_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_charset_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_convert_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_convert_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_convert_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_convert_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_create_db_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_create_db_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_create_tbl_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_create_tbl_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_create_tbl_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_create_tbl_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_enum_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_enum_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_enum_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_enum_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_insert_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_insert_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_insert_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_insert_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_instr_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_instr_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_instr_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_instr_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_join_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_join_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_join_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_join_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_left_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_left_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_left_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_left_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_length_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_length_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_length_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_length_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_like_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_like_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_like_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_like_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_locate_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_locate_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_locate_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_locate_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_lpad_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_lpad_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_lpad_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_lpad_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_ltrim_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_ltrim_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_ltrim_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_ltrim_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_ps_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_ps_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_replace_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_replace_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_replace_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_replace_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_reverse_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_reverse_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_reverse_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_reverse_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_right_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_right_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_right_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_right_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_rpad_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_rpad_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_rpad_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_rpad_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_rtrim_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_rtrim_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_rtrim_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_rtrim_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_select_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_select_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_select_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_select_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_subquery_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_subquery_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_subquery_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_subquery_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_substring_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_substring_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_substring_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_substring_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_trim_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_trim_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_trim_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_trim_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_union_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_update_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_update_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_update_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_update_utf8.test:
  Updated results
mysql-test/suite/jp/t/jp_where_sjis.test:
  Updated results
mysql-test/suite/jp/t/jp_where_ucs2.test:
  Updated results
mysql-test/suite/jp/t/jp_where_ujis.test:
  Updated results
mysql-test/suite/jp/t/jp_where_utf8.test:
  Updated results
mysql-test/suite/jp/include/trim_sjis.inc:
  Auxiliary script
mysql-test/suite/jp/t/disabled.def:
  Disable tests which suffer to an unacceptable extend
      from bug 36597 Testsuite "jp": Suspicious results for some tests

7ab1c8dc

BUG#36433: rpl_insert_id detects inconsistency on master · c25bd6fc

unknown authored May 15, 2008

Problem: If INSERT is immediately followed by SELECT in another thread,
the newly inserted rows may not be returned by the SELECT statement, if
ENGINE=myisam and @@concurrent_insert=1. This caused sporadic errors in
rpl_insert_id.
Fix: The test now uses ENGINE=$engine_type when creating tables (so that
innodb is used). It also turns off @@concurrent_insert around the critical
place, so that it works if someone in the future writes a test that sets
$engine_type=myisam before sourcing extra/rpl_tests/rpl_insert_id.test.
It also adds ORDER BY to all SELECTs so that the result is deterministic.


mysql-test/extra/rpl_tests/rpl_insert_id.test:
  - Use ENGINE=$engine_type when creating tables, since that's expected by
  suite/rpl/t/rpl_insert_id.test.
  - Use ORDER BY to avoid nondeterministic results from SELECT.
  - Set @@concurrent_insert=0 before doing SELECT after INSERT in another
  client.
mysql-test/suite/rpl/r/rpl_insert_id.result:
  Update result file.

c25bd6fc

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570 · 496ec47d

unknown authored May 15, 2008

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570


BitKeeper/deleted/.del-binlog_innodb.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  need to record.
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  need to record.
mysql-test/suite/rpl/r/rpl_sp.result:
  need to record.
mysql-test/suite/rpl/t/rpl_sp.test:
  manual merge.
sql/sp.cc:
  Manual merge

496ec47d

Disable thread_cache_size_func as reported in bug 36733 · 4f706f33
unknown authored May 15, 2008

4f706f33

14 May, 2008 3 commits

Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \ · cae6079f

unknown authored May 14, 2008

	slave

The stored-routine code took the contents of the (lowest) parser
and copied it directly to the binlog, which causes problems if there
is a special case of interpretation at the parser level -- which 
there is, in the "/*!VER */" comments.  The trailing "*/" caused
errors on the slave, naturally.

Now, since by that point we have /properly/ created parse-tree (as 
the rest of the server should do!) for the stored-routine CREATE, we
can construct a perfect statement from that information, instead of
writing uncertain information from an unknown parser state.  
Fortunately, there's already a function nearby that does exactly 
that.


mysql-test/r/binlog_innodb.result:
  Offsets changed due to quoting.
mysql-test/r/ctype_cp932_binlog.result:
  Offsets changed due to quoting.
mysql-test/r/mysqlbinlog.result:
  Case changed in result due to interpretation of data instead of 
  literal recitation.
mysql-test/r/rpl_sp.result:
  Offsets changed due to quoting.  Added tests.
mysql-test/t/rpl_sp.test:
  Add version-limiting quotes to exercise bug#36570.  Test that 
  backtick-quoted identifiers and labels work also.
sql/sp.cc:
  In create_string, we may not have a sp_name parameter yet, so
  instead pass the char* and length of the only member we'd get out
  of it.
  
  Having done that, we can use the same function to write the 
  CREATE (FUNC|TRIG|PROC) statement to the binlog as we always used
  to display the statement to the user.

cae6079f

Bug #32966: status still fails : disabling · e346232b
unknown authored May 14, 2008

e346232b
Merge bk-internal:/home/bk/mysql-5.1-bugteam · 7b3f0677
unknown authored May 14, 2008
```
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
```
7b3f0677