Commits · 788e965c3c996b39cd9afa9b6b045fe609b35348 · nexedi / MariaDB

15 Nov, 2006 1 commit

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

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.

788e965c

13 Oct, 2006 5 commits

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

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

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

a9334f02

Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254 · 47fc7ad6

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

47fc7ad6

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

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.

1dcb5963

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

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

c7fd27d3

12 Oct, 2006 32 commits

Additional patch for 5.1 commit for Bug#14262. · b0368a90

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.

b0368a90

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

Merge polly.local:/tmp/maint/bug22728/my51-bug22728 · 8c2b749e

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

8c2b749e

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

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

745327e0

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

unknown authored Oct 12, 2006

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


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

95bbf66b

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

unknown authored Oct 12, 2006

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


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

423cc0d9

Add missing semicolon · 10c20b49
unknown authored Oct 12, 2006

10c20b49

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

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

c9fdf801

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

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

97fd26d1

Make all compile-netware-* scripts executable · 3a0346de

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

3a0346de

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

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

6640642e

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

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

9b715aa6

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

17047cc1
5.1 should use libc-2006 by default · 4779c6c1
unknown authored Oct 12, 2006

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


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

e021bd4d

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

unknown authored Oct 12, 2006

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


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

d6533949

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

unknown authored Oct 12, 2006

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


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

a542f321

Look for mysql_client_test in $path_client_bindir · 801cc238
unknown authored Oct 12, 2006

801cc238
Only one switch for ssl(--with-ssl) in 5.1 · 210801f5
unknown authored Oct 12, 2006

210801f5
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 83fd305e
unknown authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
83fd305e
Switch to use yaSSL instead of OpenSSL on Netware · 70f16657
unknown authored Oct 12, 2006

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

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

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

7a70a822

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

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

39683e38

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

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

da20a076

Only print cur_file->filename if cur_file->file is set · d13e275e

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

d13e275e

Merge polly.local:/tmp/maint/bug11655/my51-bug11655 · 0d6d7a54

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

0d6d7a54

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

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

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

c623c003

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

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

6bee06c2

11 Oct, 2006 2 commits

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

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.

ec0e0bdf

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

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

a181e59e