Commits · 54c0baeecd56d0ec2265e4dceaba27e3262639aa · nexedi / MariaDB

07 Dec, 2007 9 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 54c0baee

unknown authored Dec 07, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


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

54c0baee

Add a way to remove options which mysql-test-run.pl no longer uses. · 5719de73

unknown authored Dec 07, 2007


mysql-test/mysql-test-run.pl:
  Add a way to remove options which mysql-test-run.pl no longer uses.  Since
  mysql-test-run.pl passes unrecognized options through to mysqld directly,
  it is not possible to just remove an option.  Otherwise it would be given
  to mysqld, which probably will not recognize it and will fail to start.
  
  Instead, we now explicitly ignore the option, and print a warning to
  the user.

5719de73

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 5a52e533
unknown authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_table.cc:
  Auto merged
```
5a52e533

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · b4accb75

unknown authored Dec 07, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/grant.result:
  Manual merge
mysql-test/t/grant.test:
  Manual merge

b4accb75

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 69ba161c
unknown authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/sql_table.cc:
  Auto merged
```
69ba161c

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 3d2ff984

unknown authored Dec 07, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


mysql-test/t/grant.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/grant.result:
  Manual merge

3d2ff984

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 6c4f81c9

unknown authored Dec 07, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


strings/ctype-simple.c:
  use local (null merge)

6c4f81c9

Make tests more robust (clean up better after grant.test) · 47707bd4

unknown authored Dec 07, 2007


mysql-test/r/grant.result:
  Update test results to .test changes
mysql-test/t/grant.test:
  Drop users when done with them, to avoid skewing results of later tests.
  
  For example, running some test which examines the cardinality of the
  mysql.user table would fail if run right after this test, due to the
  extra users.

47707bd4

Move the test case for bug #20901 from create.test to grant.test, so · f11b6dbe

unknown authored Dec 07, 2007

testing embedded server works correctly.


mysql-test/r/create.result:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/r/grant.result:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/t/create.test:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/t/grant.test:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).

f11b6dbe

06 Dec, 2007 2 commits
- Fix compiler warning about wrong integer size (probably harmless) · 6c142012
  unknown authored Dec 06, 2007
```
sql/sql_select.cc:
  Fix compiler warning (probably harmless, wrong integer size)
```
  6c142012
- ctype-simple.c: Backport quick fix to remove Windows compiler warnings · 4b32c7ef
  unknown authored Dec 06, 2007
```
strings/ctype-simple.c:
  Backport quick fix to remove Windows compiler warnings.
```
  4b32c7ef
05 Dec, 2007 8 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · f4127cc9

unknown authored Dec 05, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged

f4127cc9

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · a24c025e

unknown authored Dec 05, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/set_var.cc:
  Auto merged

a24c025e

Post-merge fix (reorder tests in ctype_ucs.test) · 7e0049a4
unknown authored Dec 05, 2007
```
mysql-test/t/ctype_ucs.test:
  Post-merge fix (fix order of tests to match results).
```
7e0049a4

Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 67da1a19

unknown authored Dec 05, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/t/log_state.test:
  Manual merge fix-up
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/r/func_misc.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/key.result:
  Manual merge
mysql-test/r/log_state.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_killed.test:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
mysql-test/t/key.test:
  Manual merge
sql/item_strfunc.h:
  Manual merge
strings/ctype-simple.c:
  Manual merge

67da1a19

Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1 · d49d3637
unknown authored Dec 05, 2007
```
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
```
d49d3637

Bug#32996 log_tables.test fails sporadically · 6308a5f0

unknown authored Dec 05, 2007

Only select entries from the general_log that were issued by the current
connection.


mysql-test/r/log_tables.result:
  Update test result.
mysql-test/t/log_tables.test:
  Only select entries from the current thread.

6308a5f0

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · a368c38e

unknown authored Dec 04, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/r/func_misc.result:
  Manual merge
mysql-test/t/binlog_killed.test:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
sql/item_strfunc.h:
  Manual merge
strings/ctype-simple.c:
  Manual merge

a368c38e

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a0e0974

unknown authored Dec 04, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41


sql/set_var.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge

9a0e0974

04 Dec, 2007 2 commits

Bug#32966 main.status fails. · 6a842299

unknown authored Dec 04, 2007

Disable failing test case.


mysql-test/t/disabled.def:
  Disable main.status test case.

6a842299

Bug#32965 main.ctype_create fails. · 8fcb6eb2

unknown authored Dec 04, 2007

Disable failing test case.


mysql-test/t/disabled.def:
  Disable main.ctype_create test case.

8fcb6eb2

02 Dec, 2007 5 commits

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · b4fe65c0

unknown authored Dec 02, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

b4fe65c0

Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · 7f299208

unknown authored Dec 02, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

7f299208

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 7980537c

unknown authored Dec 02, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

7980537c

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 60d134ab

unknown authored Dec 02, 2007

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

60d134ab

Windows-specific fixes in floating point tests. · f7bd0808

unknown authored Dec 02, 2007


mysql-test/t/insert.test:
  Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result
mysql-test/t/variables.test:
  We need to do replace_result because variables are printed by another procedure.
sql/field.cc:
  Fixed the code to limit the precision to DBL_DIG.

f7bd0808

01 Dec, 2007 14 commits

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 553175ff

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged

553175ff

Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · 0f603a18

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged

0f603a18

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · a4ba80a8

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged

a4ba80a8

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · f917ca0c

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
sql/field.cc:
  Auto merged

f917ca0c

Fixed the floating point number tests on Windows. · cf4b8f6a

unknown authored Dec 01, 2007


mysql-test/r/insert.result:
  Fixed the test cases.
mysql-test/t/cast.test:
  We need to do replace_result because warnings are printed by another procedure.
mysql-test/t/insert.test:
  Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result.
sql/field.cc:
  Limit the precision to avoid garbage past the significant digits.

cf4b8f6a

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · e6cd371d
unknown authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/field.cc:
  Auto merged
```
e6cd371d
Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · f155c174
unknown authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/field.cc:
  Auto merged
```
f155c174
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 509d07bf
unknown authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


sql/field.cc:
  Auto merged
```
509d07bf
Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · b2c7af4a
unknown authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


sql/field.cc:
  Auto merged
```
b2c7af4a
Fixed the build failure on Windows. It does not have trunc() defined in... · 371514ec
unknown authored Dec 01, 2007
```
Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code.
```
371514ec

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 7126b750

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

7126b750

Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · 007dfb24

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
mysql-test/r/insert.result:
  SCCS merged
mysql-test/t/insert.test:
  SCCS merged

007dfb24

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 961f3586

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
mysql-test/r/insert.result:
  SCCS merged
mysql-test/t/insert.test:
  SCCS merged

961f3586

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 5e5f4ba8

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


mysql-test/r/insert.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  SCCS merged

5e5f4ba8