Commits · 5db3756ab31f69f447f195192e27b270e5997af1 · nexedi / MariaDB

20 Nov, 2006 3 commits

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · 5db3756a

unknown authored Nov 20, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


scripts/mysql_fix_privilege_tables.sql:
  Auto merged

5db3756a

Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and · ccd60982

unknown authored Nov 20, 2006

"Y" are different) to utf8_general_ci (where same).


scripts/mysql_fix_privilege_tables.sql:
  Change collation for ALTER-omitted ENUMs from utf8_bin (where "y" and 
  "Y" are different) to utf8_general_ci (where same).  In the previous 
  statement, we clobber the collation to utf8_bin for all columns, and 
  that's the wrong thing to do for enums.

ccd60982

Bug#23983 ps.test fails to open shared library. · 80ed7e1a

unknown authored Nov 20, 2006

- Corrected mistake in Windows only test.


mysql-test/r/windows.result:
  Bug#23983 ps.test fails to open shared library.
  - Windows Result cleanup.
mysql-test/t/windows.test:
  Bug#23983 ps.test fails to open shared library.
  - Windows Test cleanup.

80ed7e1a

17 Nov, 2006 16 commits

Merge amd64.:D:/src/mysql-5.1-maint · 9eb09ef2

unknown authored Nov 17, 2006

into  amd64.:D:/src/mysql-5.1-maint_bug23983


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

9eb09ef2

Bug#23983 ps.test fails to open shared library. · 3ee0d5de

unknown authored Nov 17, 2006

- When a shared library argument is supplied, it's checked for an OS
specific directory separator.  The expected error is different
depending on the separator used. Created OS specific versions of these
tests.


mysql-test/r/ps.result:
  Bug#23983 ps.test fails to open shared library.
  - Moving to OS specific results.
mysql-test/r/windows.result:
  Bug#23983 ps.test fails to open shared library.
  - OS Specific result for shared library argument with path
mysql-test/t/ps.test:
  Bug#23983 ps.test fails to open shared library.
  - Moving to OS specific tests.
mysql-test/t/windows.test:
  Bug#23983 ps.test fails to open shared library.
  - OS Specific test for shared library argument with path
mysql-test/r/ps_not_windows.result:
  Bug#23983 ps.test fails to open shared library.
  - OS Specific result for shared library argument with path
mysql-test/t/ps_not_windows.test:
  Bug#23983 ps.test fails to open shared library.
  - OS Specific test for shared library argument with path

3ee0d5de

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · e46dbc9b

unknown authored Nov 17, 2006

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-16456


mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

e46dbc9b

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

unknown authored Nov 17, 2006

Fix tests for new behaviour: an error is thrown if a NON DETERMINISTIC
stored function (SF) is called during statement-based replication (SBR).


mysql-test/r/func_time.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/r/gis.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Mark function as DETERMINISTIC so it can be called with no error while
  doing statement-based replication (SBR).
mysql-test/r/grant2.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/r/innodb_notembedded.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/r/ps.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Mark function as DETERMINISTIC so it can be called with no error while
  doing statement-based replication (SBR).
mysql-test/r/query_cache.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/r/query_cache_notembedded.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/r/rpl_sp.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Move test for SF-calls in different replication modes to its own file, rpl_sf.
mysql-test/r/rpl_sp_effects.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/r/sp.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Mark function as DETERMINISTIC so it can be called with no error while
  doing statement-based replication (SBR).
mysql-test/r/timezone2.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/func_time.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/gis.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Mark function as DETERMINISTIC so it can be called with no error while
  doing statement-based replication (SBR).
mysql-test/t/grant2.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/innodb_notembedded.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/ps.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/query_cache.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/query_cache_notembedded.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/rpl_sp.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/rpl_sp_effects.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
mysql-test/t/sp.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Mark function as DETERMINISTIC so it can be called with no error while
  doing statement-based replication (SBR).
mysql-test/t/timezone2.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Modify test that contains non-deterministic functions so it can still be
  called with no error while doing statement-based replication (SBR).
sql/item_func.cc:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  If 'log_bin_trust_function_creators' variable is set, don't throw an error
  on calling a non-deterministc function in statement-based replication (SBR).
sql/sql_parse.cc:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Do not throw an error on calling a NON DETERMINISTIC stored procedure (SP)
  while doing statement-based replication (SBR), as the routine body is
  executed statement-by-statement.
mysql-test/r/rpl_sf.result:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Test for stored function (SF) calls in different replication modes.
  NON DETERMINISTIC SFs are not allowed while doing
  statement-based replication (SBR).
mysql-test/t/rpl_sf.test:
  Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
  
  Test for stored function (SF) calls in different replication modes.
  NON DETERMINISTIC SFs are not allowed while doing
  statement-based replication (SBR).

b84e9d10

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 0aad12d9

unknown authored Nov 17, 2006

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote

0aad12d9

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · ff5062ca

unknown authored Nov 17, 2006

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


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge backport

ff5062ca

Remove unused variables/options that does not have any effect · 0c9530f2
unknown authored Nov 17, 2006
```
Update usage description
```
0c9530f2
Cleanup --extern implementation, remove some unused variables and check arguments · a57542e8
unknown authored Nov 17, 2006

a57542e8
BUG#24354 option "--extern" of mysql-test-run.pl does not work anymore · c341ca22
unknown authored Nov 17, 2006
```
mysql-test/mysql-test-run.pl:
  Don't require restart if master is not started when running with --extern
```
c341ca22

BUG#24274 option "--big-test" of mysql-test-run.pl does not work anymore · 02cd4f5a

unknown authored Nov 17, 2006


mysql-test/lib/mtr_cases.pl:
  Don't look at lines that start with # ie. a comment
mysql-test/mysql-test-run.pl:
  Set env BIG_TEST if --big-test passed

02cd4f5a

remove junk comment · f3e8cb19
unknown authored Nov 17, 2006

f3e8cb19
Merge bk-internal:/home/bk/mysql-5.0-maint · 14abceaa
unknown authored Nov 17, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
14abceaa
Merge bk-internal:/home/bk/mysql-5.1-new-maint · e90bf564
unknown authored Nov 17, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
e90bf564
Merge 192.168.0.4:mysql/bug22958/my50-bug22958 · 9260b74e
unknown authored Nov 17, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/mysqld.cc:
  Auto merged
```
9260b74e

Bug#24274 option "--big-test" of mysql-test-run.pl does not work anymore · 060c768c

unknown authored Nov 17, 2006

 - Set environment variable BIG_TEST when using --big-test
 - Skip comment lines when looking for features a test case supports.


mysql-test/lib/mtr_cases.pl:
  Skip all lines that start with # when looking for features required by the test case
mysql-test/mysql-test-run.pl:
  Set environment variable BIG_TEST if option --big-test passed.

060c768c

Bug#24354 option "--extern" of mysql-test-run.pl does not work anymore · f142723e

unknown authored Nov 17, 2006

 - Dont require restart when using extern and there is no record of
   master being started(pid is not known) 


mysql-test/mysql-test-run.pl:
  Don't require restart when running against extern server and no
  record of master being started

f142723e

16 Nov, 2006 20 commits

This command is not portable, as POSIX does not require it; use . instead. · ca700777
unknown authored Nov 16, 2006
```
(Bug #24294)
```
ca700777
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · b81f37ed
unknown authored Nov 16, 2006
```
into  example.com:/work/bug24219/my51
```
b81f37ed
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 3d958eb1
unknown authored Nov 16, 2006
```
into  example.com:/work/bug24219/my50


sql/sql_table.cc:
  Auto merged
```
3d958eb1
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 8bb9d589
unknown authored Nov 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
8bb9d589
Add the two new functions to udf_example.def so they will be exported by dll's · ec71e89a
unknown authored Nov 16, 2006

ec71e89a

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 7414edb6

unknown authored Nov 16, 2006

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


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

7414edb6

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · a30f7c76

unknown authored Nov 16, 2006

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


mysql-test/mysql-test-run.pl:
  Manual merge of backport

a30f7c76

Put more spcific paths at the top of list to search for binaries · d274d475
unknown authored Nov 16, 2006

d274d475

Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint · 902ce6fc

unknown authored Nov 16, 2006

into  mysql.com:/usr/home/ram/work/mysql-5.1-maint


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

902ce6fc

Merge bk-internal:/home/bk/mysql-4.1-maint · fb1aab1a

unknown authored Nov 16, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Manual merge of fix for location of mysql_client_test

fb1aab1a

after-merge fixup. · 8639c18f
unknown authored Nov 16, 2006
```
  - have to explicitly set null_value.
```
8639c18f

Merge example.com:/work/bug24219/my50 · 05a2da2c

unknown authored Nov 16, 2006

into  example.com:/work/bug24219/my51


mysql-test/t/alter_table.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/alter_table.result:
  manual merge

05a2da2c

Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash · d63fa0a4

unknown authored Nov 16, 2006

(this is the 5.0 patch, because 4.1 differs)
  
There was an improper order of doing chained operations.
  
To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.


mysql-test/r/alter_table.result:
  post-merge fix
  my locale is utf8, and this breaks non-utf8 stuff when doing manual merge :(
sql/sql_table.cc:
  If there is operation on the KEYS, first do it
  and then do a rename if there is such. Or, we will crash because
  the underlying table has changed.

d63fa0a4

Merge example.com:/work/bug24219/my41 · db42257d

unknown authored Nov 16, 2006

into  example.com:/work/bug24219/my50


mysql-test/t/alter_table.test:
  Auto merged
sql/sql_table.cc:
  manual merge
mysql-test/r/alter_table.result:
  manual merge

db42257d

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · f754fd25
unknown authored Nov 16, 2006
```
into  mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
```
f754fd25

Fix for bug#24219 ALTER TABLE ... RENAME TO ... , DISABLE KEYS leads to crash · 09fc514b

unknown authored Nov 16, 2006

There was an improper order of doing chained operations.

To the documentor: ENABLE|DISABLE KEYS combined with RENAME TO, and no other
ALTER TABLE clause, leads to server crash independent of the presence of
indices and data in the table.


mysql-test/r/alter_table.result:
  update result
mysql-test/t/alter_table.test:
  add test for bug#24129
sql/sql_table.cc:
  If there is operation on the KEYS, first do it
  and then do a rename if there is such. Or, we will crash because
  the underlying table has changed.

09fc514b

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 3ea5628b
unknown authored Nov 16, 2006
```
into  mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
```
3ea5628b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 153421fb
unknown authored Nov 16, 2006
```
into  mysql.com:/usr/home/ram/work/bug23653/my51-bug23653


mysql-test/r/func_time.result:
  Auto merged
```
153421fb

Merge mysql.com:/usr/home/ram/work/bug23653/my50-bug23653 · 7d8b858e

unknown authored Nov 16, 2006

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


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

7d8b858e

Merge mysql.com:/usr/home/ram/work/bug23653/my41-bug23653 · 096631a3

unknown authored Nov 16, 2006

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


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

096631a3

15 Nov, 2006 1 commit
- post-merge fix · 84b9fecf
  unknown authored Nov 15, 2006
```
mysql-test/r/sp.result:
  update result
```
  84b9fecf