Commits · 8e6e313c3622271981911031528509746f1a68e3 · Kirill Smelkov / mariadb

11 Dec, 2007 5 commits
- bug#33142: access after free() for blob replication and online alter table · 8e6e313c
  unknown authored Dec 11, 2007
  
  8e6e313c
- compile error fix for osx · 481385de
  unknown authored Dec 11, 2007
  
  481385de
- bug#32759 already fixed · c4a39468
  unknown authored Dec 11, 2007
```
mysql-test/suite/ndb/t/disabled.def:
  bug#32759 already fixed
  - see rev 1.131.1.6 of sql/ha_ndbcluster_binlog.cc
```
  c4a39468
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · aff01f11
  unknown authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1


storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  ul
```
  aff01f11
- remoce compiler warnings · 6629d45f
  unknown authored Dec 11, 2007
  
  6629d45f
10 Dec, 2007 7 commits

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · 865243bf

unknown authored Dec 10, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  manual merge
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  manual merge

865243bf

backport test for bug#30674 · dad3e3f6
unknown authored Dec 10, 2007
```
(bug not present in 5.1)
```
dad3e3f6

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 15cc254c

unknown authored Dec 10, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

15cc254c

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · b74c55e8

unknown authored Dec 10, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

b74c55e8

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 4c6e70cc

unknown authored Dec 10, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

4c6e70cc

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · c853fa4f

unknown authored Dec 10, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/ha_ndbcluster_binlog.cc:
  Auto merged

c853fa4f

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · b8ecfef8
unknown authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
b8ecfef8

07 Dec, 2007 18 commits

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

unknown authored Dec 07, 2007

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


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

7d734a87

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

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.

f77684f3

Removed illegal cast · f3ccf7ea
unknown authored Dec 07, 2007

f3ccf7ea
Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb · 122b4640
unknown authored Dec 07, 2007
```
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Merge
```
122b4640
Removed illegal cast · 4931d5ca
unknown authored Dec 07, 2007

4931d5ca
Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb · e7af3069
unknown authored Dec 07, 2007
```
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Merge
```
e7af3069
Removed illegal cast · 28d26808
unknown authored Dec 07, 2007

28d26808
bug#21072 Duplicate key error in NDB references wrong key: regenerated result · 419e8cf7
unknown authored Dec 07, 2007

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


sql/sql_table.cc:
  Auto merged
```
cba3ed19

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

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

284cb0e5

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


sql/sql_table.cc:
  Auto merged
```
a4df2210

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

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

6e776686

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

unknown authored Dec 07, 2007

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


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

8c033250

Make tests more robust (clean up better after grant.test) · 7d3a61e1

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.

7d3a61e1

bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes · 154ffb3f
unknown authored Dec 07, 2007

154ffb3f

Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb · f0e3f8f1

unknown authored Dec 07, 2007

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


storage/ndb/include/kernel/signaldata/TcKeyRef.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Merge

f0e3f8f1

bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes · 8db8ab33
unknown authored Dec 07, 2007

8db8ab33

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

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).

20bbe71d

06 Dec, 2007 3 commits
- Fix compiler warning about wrong integer size (probably harmless) · 2632dbf6
  unknown authored Dec 06, 2007
```
sql/sql_select.cc:
  Fix compiler warning (probably harmless, wrong integer size)
```
  2632dbf6
- ctype-simple.c: Backport quick fix to remove Windows compiler warnings · 18d14b3a
  unknown authored Dec 06, 2007
```
strings/ctype-simple.c:
  Backport quick fix to remove Windows compiler warnings.
```
  18d14b3a
- bug#21072 Duplicate key error in NDB references wrong key: Return correct key... · f9bae745
  unknown authored Dec 06, 2007
```
bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts
```
  f9bae745
05 Dec, 2007 7 commits

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

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

80360321

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

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

a9383147

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

Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 068b6e42

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

068b6e42

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

Bug#32996 log_tables.test fails sporadically · 6bfa2a01

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.

6bfa2a01

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

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

55a420e1