Commits · beea1235469f3de2d703e5a413f06675d9a67c48 · Kirill Smelkov / mariadb

15 Nov, 2006 1 commit

Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR" · beea1235

unknown authored Nov 15, 2006

calling (rather than defining) non-deterministic SP in SBR (as opposed
to RBR or mixed) will throw an error now.

require mixed mode for tests now. SBR will now fail when calling
non-deter SPs and SFs (as it should), and RBR already failed by virtue of
giving different results for "show binlog" than the results-file has.
also test for 16456 now. lastly make amends because one of the tests
fails with a new error # now as code was added to sql_trigger.cc while
test was disabled.


mysql-test/mysql-test-run.pl:
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  mtr falsely assumed that default rep mode is stmt i/o mixed?
mysql-test/r/func_time.result:
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  rpl_sp.test was disabled for a while; update results where wording has
  changed and add results for #16456
mysql-test/r/rpl_sp.result:
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  rpl_sp.test was disabled for a while; update results where wording has
  changed and add results for #16456
  ---
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  calling (rather than defining) non-deterministic SP or SF in SBR
  (as opposed to RBR or mixed) will throw an error now.
mysql-test/t/disabled.def:
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  re-enable rpl_sp.test
mysql-test/t/rpl_sp.test:
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  require mixed mode for tests now. SBR will now fail when calling
  non-deter SPs (as it should), and RBR already failed by virtue of
  giving different results for "show binlog" than the results-file has.
  also test for 16456 now. lastly make amends because one of the tests
  fails with a new error # now as code was added to sql_trigger.cc while
  test was disabled.
  ---
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  calling (rather than defining) non-deterministic SP or SF in SBR
  (as opposed to RBR or mixed) will throw an error now.
sql/item_func.cc:
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  calling (rather than defining) non-deterministic SF in SBR
  (as opposed to RBR or mixed) will throw an error now.
sql/sql_parse.cc:
  Bug#16456 "RBR: rpl_sp.test expects query to fail, but passes in RBR"
  
  calling (rather than defining) non-deterministic SP in SBR (as opposed
  to RBR or mixed) will throw an error now.

beea1235

13 Oct, 2006 5 commits

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4a488c06
unknown authored Oct 13, 2006
```
into  mysql.com:/usr/home/ram/work/bug23254/my51-bug23254
```
4a488c06

Merge mysql.com:/usr/home/ram/work/bug23254/my50-bug23254 · 20a2a997

unknown authored Oct 13, 2006

into  mysql.com:/usr/home/ram/work/bug23254/my51-bug23254


mysql-test/r/func_compress.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

20a2a997

Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254 · 0ace2b44

unknown authored Oct 13, 2006

into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_compress.result:
  SCCS merged
mysql-test/t/func_compress.test:
  SCCS merged

0ace2b44

Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL · 60a21d16

unknown authored Oct 13, 2006

We don't set null_value to 0 in the Item_func_compress::val_str() for 
not-NULL results.


mysql-test/r/func_compress.result:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - test result.
mysql-test/t/func_compress.test:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - test case.
sql/item_strfunc.cc:
  Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
    - set null_value.

60a21d16

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · e892ca2a

unknown authored Oct 13, 2006

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


BitKeeper/etc/collapsed:
  auto-union
sql/sql_acl.cc:
  Auto merged

e892ca2a

12 Oct, 2006 32 commits

Additional patch for 5.1 commit for Bug#14262. · 0b48fb08

unknown authored Oct 12, 2006


sql/sp.cc:
  Update binlog-writing scheme to 5.1 model.
sql/sql_acl.cc:
  Update binlog-writing scheme to 5.1 model.
sql/sql_trigger.cc:
  Update binlog-writing scheme to 5.1 model.

0b48fb08

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 53f3a0e2
unknown authored Oct 12, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
53f3a0e2

Merge polly.local:/tmp/maint/bug22728/my51-bug22728 · 24fd9b90

unknown authored Oct 12, 2006

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/handler.cc:
  Auto merged

24fd9b90

Merge polly.local:/tmp/maint/bug22728/my50-bug22728 · e1b59ec6

unknown authored Oct 12, 2006

into  polly.local:/tmp/maint/bug22728/my51-bug22728


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
sql/handler.cc:
  Auto merged

e1b59ec6

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · f104a7a9

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

f104a7a9

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · a4f01a94

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

a4f01a94

Add missing semicolon · e203f0e5
unknown authored Oct 12, 2006

e203f0e5

Merge polly.local:/tmp/maint/bug22728/my41-bug22728 · 0f78f13a

unknown authored Oct 12, 2006

into  polly.local:/tmp/maint/bug22728/my50-bug22728


mysql-test/r/innodb_mysql.result:
  Null merge from 4.1
mysql-test/t/innodb_mysql.test:
  Null merge from 4.1
sql/handler.cc:
  Null merge from 4.1

0f78f13a

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 2bf8271f

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


netware/BUILD/compile-netware-max-debug:
  Auto merged
netware/BUILD/compile-netware-max:
  Auto merged

2bf8271f

Make all compile-netware-* scripts executable · dd519d11

unknown authored Oct 12, 2006


netware/BUILD/compile-netware-max:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-max-debug:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-src:
  Change mode to -rwxrwxr-x

dd519d11

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · c81dd935

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

c81dd935

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 4779978b

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

4779978b

Move the reconnect variable to beginning of function · 7405e779
unknown authored Oct 12, 2006
```
Fix warning about value from "*ptr++" not being used. Changed it to ptr++ 
```
7405e779
Add win paths for mysql_client_test · 84617169
unknown authored Oct 12, 2006

84617169
5.1 should use libc-2006 by default · 3fb85dca
unknown authored Oct 12, 2006

3fb85dca
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · d3c525dc
unknown authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


netware/BUILD/mwenv:
  Auto merged
```
d3c525dc
Use libc-2003 if available else default to libc · c5cebf20
unknown authored Oct 12, 2006

c5cebf20

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 21ca14f0

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

21ca14f0

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · be4d0286

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

be4d0286

Look for mysql_client_test in $path_client_bindir · 1bb09d53
unknown authored Oct 12, 2006

1bb09d53
Only one switch for ssl(--with-ssl) in 5.1 · a1a0b3de
unknown authored Oct 12, 2006

a1a0b3de
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 1a0d3bb1
unknown authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
1a0d3bb1
Switch to use yaSSL instead of OpenSSL on Netware · aed3bd41
unknown authored Oct 12, 2006

aed3bd41
Merge bk-internal:/home/bk/mysql-5.1-maint · 6b328fc4
unknown authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
6b328fc4

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 450eab19

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
sql-common/client.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote

450eab19

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 4d45abc5

unknown authored Oct 12, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
sql-common/client.c:
  Auto merged

4d45abc5

Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist · 00f420db

unknown authored Oct 12, 2006


mysql-test/lib/mtr_process.pl:
  Remove junk code/comments
  Moved the creation of var/log out of function mtr_kill_leftovers
mysql-test/mysql-test-run.pl:
  Rename 'kill_running_server' to more appropriate name 'kill_running_servers'
  If no var/log dir exists when mtr_kill_leftovers is started it should be created
  Remove "unless" syntax, too perlish
  Fix typo

00f420db

Only print cur_file->filename if cur_file->file is set · 1f837a5c

unknown authored Oct 12, 2006

MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that

1f837a5c

Merge polly.local:/tmp/maint/bug11655/my51-bug11655 · 131d8b86

unknown authored Oct 12, 2006

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx


include/my_time.h:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/r/func_time.result:
  Manually merged

131d8b86

Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is called · 6cbc74a7
unknown authored Oct 12, 2006
```
Add DBUG_PRINT to show the value of mysql->reconnect
```
6cbc74a7

Merge polly.local:/tmp/maint/bug11655/my50-bug11655 · 45af97ad

unknown authored Oct 12, 2006

into  polly.local:/tmp/maint/bug11655/my51-bug11655


mysql-test/r/func_time.result:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

45af97ad

5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1 · 62e102b4

unknown authored Oct 12, 2006


mysql-test/r/func_time.result:
  Fixed func_time test when merging the fix for bug #11655 and bug #20927 to 5.0
sql/item_timefunc.cc:
  Fixed compilation when merging the fix for bug #11655 and bug #20927 to 5.0

62e102b4

11 Oct, 2006 2 commits

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262 · 21e525c5

unknown authored Oct 11, 2006

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


BitKeeper/deleted/.del-collapsed~66d21d0d6c19df3d:
  Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
  'Auto converge'
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
sql/sql_parse.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
sql/sql_view.cc:
  Manual merge.
vio/viosocket.c:
  Manual merge.

21e525c5

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · e5c2eda4

unknown authored Oct 11, 2006

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

e5c2eda4