Commits · 14f8d7685e69f047ac89a3ab92a86752516411a8 · nexedi / MariaDB

21 Nov, 2006 13 commits

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 14f8d768

unknown authored Nov 21, 2006

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


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged

14f8d768

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 8f93a6c9

unknown authored Nov 21, 2006

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


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged

8f93a6c9

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · e7065e06
unknown authored Nov 21, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
e7065e06

Merge 192.168.0.4:mysql/mysql-4.1-maint · 92930c12

unknown authored Nov 21, 2006

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


client/mysqltest.c:
  Auto merged

92930c12

Remove unused variable · a599cea1
unknown authored Nov 21, 2006

a599cea1

Add ALTER TABLE MODIFY statements in addition to the ALTER TABLE ADD for new · 67e943cd

unknown authored Nov 21, 2006

columns to make sure they both exist and have the intended type

scripts/mysql_fix_privilege_tables.sql:
Can't attempt to MODIFY columns of a table before they exists. The
new column's Create_view_priv,Show_view_priv, Create_routine_priv,
Alter_routine_priv and Create_user_priv might not exists when
upgrading. Thus an ALTER TABLE MODIFY is added in addition to the
ALTER TABLE ADD that would have added them if they didn't exist.
In this way can be sure the columns both exist and are of the correct type

67e943cd

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

unknown authored Nov 21, 2006

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


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

a4c1ce7f

Merge bk-internal:/home/bk/mysql-5.0-maint · 01532e3f
unknown authored Nov 21, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
01532e3f

Rename system_mysql_db_fix.test to system_mysql_db_fix30020 as it tests · c9eb0a63

unknown authored Nov 21, 2006

mysql_fix_privilege_tables.s's ability to convert the system tables as of
3.20 to current system table format
Add similar test for 4.1.23 tables - but use "mysql < mysql_fix_privilege_tables.sql"
so it can be run on any platform. 


mysql-test/t/system_mysql_db_fix30020-master.opt:
  Rename: mysql-test/t/system_mysql_db_fix-master.opt -> mysql-test/t/system_mysql_db_fix30020-master.opt
mysql-test/mysql-test-run.pl:
  Find mysql_fix_privilege_tables.sql and assign it's path and name to $MYSQL_FIX_PRIVILEGE_TABLES
mysql-test/t/system_mysql_db_fix30020.test:
  Send output to var/log/system_mysql_db_fix30020.err
  Add some more comments
mysql-test/t/system_mysql_db_fix40123-master.opt:
  New BitKeeper file ``mysql-test/t/system_mysql_db_fix40123-master.opt''
mysql-test/t/system_mysql_db_fix40123.test:
  New BitKeeper file ``mysql-test/t/system_mysql_db_fix40123.test''

c9eb0a63

Get name for .reject and .log files from result file name · d4aadb06
unknown authored Nov 21, 2006

d4aadb06
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 77bae596
unknown authored Nov 21, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
```
77bae596
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 0f27fa86
unknown authored Nov 21, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
0f27fa86
Add missing semicolon · fba971f5
unknown authored Nov 21, 2006

fba971f5

20 Nov, 2006 9 commits

Merge bk-internal:/home/bk/mysql-4.1-maint · 1273bc19
unknown authored Nov 21, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
```
1273bc19

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

unknown authored Nov 21, 2006

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


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged

41d9b713

Port mysql_upgrade to be tested on windows · 4cd2aa73

unknown authored Nov 21, 2006


client/mysql_upgrade.c:
  Send error messages to stderr
  Add new define EXTRA_CLIENT_PATHS containing additional paths where
  to look for the client binaries

4cd2aa73

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 2244f8e7
unknown authored Nov 20, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
2244f8e7
Merge bk-internal:/home/bk/mysql-5.0-maint · 5511b52c
unknown authored Nov 20, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
5511b52c

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

Fix mysqltest to automatically replace \ with / also in · bca9a29e

unknown authored Nov 20, 2006

$MYSQLTEST_VARDIR, for usage of vardir=e:/var<nnn> on windows


client/mysqltest.c:
  Add auto replace for $MYSQLTEST_VARDIR
  Only add strings with strlen > to patterns array - avoids
  lot of strlen calls

bca9a29e

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 17 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 bk-internal:/home/bk/mysql-4.1-maint · 0bfad0da
unknown authored Nov 17, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
0bfad0da

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 1 commit
- This command is not portable, as POSIX does not require it; use . instead. · ca700777
  unknown authored Nov 16, 2006
```
(Bug #24294)
```
  ca700777