Commits · 842b86366386c93b7389b728fd69639d3e1cfb49 · nexedi / MariaDB

30 Nov, 2006 10 commits

bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · 842b8636
unknown authored Nov 30, 2006
```
bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: updated test result
```
842b8636

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · e8e67e5a

unknown authored Nov 30, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

e8e67e5a

bug#24303 Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix... · 73014a29

unknown authored Nov 30, 2006

bug#24303  Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix for bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key, solves it a better way

73014a29

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 9d137d0f

unknown authored Nov 30, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/sql_cache.cc:
  Merge

9d137d0f

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 7ea50143

unknown authored Nov 30, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/r/ndb_update.result:
  Using local, will regenerate

7ea50143

#18487 UPDATE IGNORE not supported for unique constraint violation of... · d4efa758
unknown authored Nov 30, 2006
```
#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows
```
d4efa758
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · d7c315a1
unknown authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
```
d7c315a1

Removed return of illegal pointer, changed signatures to... · 8f20d330

unknown authored Nov 30, 2006

Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel

8f20d330

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · f513b974

unknown authored Nov 30, 2006

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


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

f513b974

A post-merge fix: fix the failing trigger-grant.test. · 2002e4bc

unknown authored Nov 30, 2006


sql/sql_trigger.cc:
  Another post-merge fix: make TRIGGER privilege work again, after
  IF EXISTS refactoring.

2002e4bc

29 Nov, 2006 30 commits

A post-merge fix. · c7c560f6

unknown authored Nov 30, 2006


mysql-test/r/func_str.result:
  Update results (a post-merge fix).

c7c560f6

A post-merge fix. · 400b094c
unknown authored Nov 30, 2006

400b094c

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5c6fdb83

unknown authored Nov 30, 2006

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Use local.
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.

5c6fdb83

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 74cfb1ed
unknown authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
74cfb1ed
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 677294e5
unknown authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
677294e5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · f1bb5185
unknown authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
f1bb5185
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f896d2b
unknown authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
```
5f896d2b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 1d31140e
unknown authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/sql_yacc.yy:
  Auto merged
```
1d31140e

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 78ade29e

unknown authored Nov 29, 2006

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

78ade29e

Many files: · c41da42c

unknown authored Nov 29, 2006

  Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries


config/ac-macros/ssl.m4:
  Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
  Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
  Changed paths to ndb include directory to include "storage"

c41da42c

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · ebb40c86

unknown authored Nov 29, 2006

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged

ebb40c86

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · a1a09c45
unknown authored Nov 29, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637


sql/sql_yacc.yy:
  Auto merged
```
a1a09c45
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637 · 9bf4d9e5
unknown authored Nov 29, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637


sql/sql_yacc.yy:
  Auto merged
```
9bf4d9e5

bug#24303 Wrong result for UPDATE IGNORE for NDB table: Refinement, only read... · 915000fe

unknown authored Nov 29, 2006

bug#24303  Wrong result for UPDATE IGNORE for NDB table: Refinement, only read all fields for UPDATE IGNORE with pk (check if UPDATE command and pk in write_set)

915000fe

Merge mysql.com:/home/kent/bk/mysql-5.0-build · c68df141

unknown authored Nov 29, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

c68df141

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · f0dd9dd3
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


sql-common/my_time.c:
  Auto merged
```
f0dd9dd3
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 4c2a1ef0
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
```
4c2a1ef0
Merge mysql.com:/home/kent/bk/mysql-4.1-build · 0907cd18
unknown authored Nov 29, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
0907cd18

BUG#20637: "load data concurrent infile" locks the table · d8d23348

unknown authored Nov 29, 2006

Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
inside a stored routine and MySQL is compiled with Query Cache support
(this is not in the manual).

The problem was that the condition test of "we are inside stored routine"
was reversed, thus CONCURRENT _worked only_ from stored routine.  The
solution is to use proper condition test.

No test case is provided because the test case would require a large
amount of input, and it's hard to tell is SELECT is really blocked or
just slow (subject to race).


sql/sql_yacc.yy:
  Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT,
  which was reversed, and return valid value if we are in SP.

d8d23348

bug#24303 Wrong result for UPDATE IGNORE for NDB table: Read all fields for UPDATE IGNORE with pk · d82e2866
unknown authored Nov 29, 2006

d82e2866

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · dc85e9be

unknown authored Nov 29, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged

dc85e9be

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 7d6448dc

unknown authored Nov 29, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_update.result:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged

7d6448dc

bug#24303 Wrong result for UPDATE IGNORE for NDB table: Added test case · 3d629d9f
unknown authored Nov 29, 2006

3d629d9f
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 90ac2513
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
90ac2513

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · e5cdaadc

unknown authored Nov 29, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

e5cdaadc

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 8d2295b5
unknown authored Nov 29, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
```
8d2295b5

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · d1f8c80b

unknown authored Nov 29, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

d1f8c80b

minor fix · 45366d19

unknown authored Nov 29, 2006


mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

45366d19

Merge bk-internal:/home/bk/mysql-5.1 · 76a41731

unknown authored Nov 29, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/sql_parse.cc:
  Auto merged

76a41731

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d1e66a3

unknown authored Nov 29, 2006

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Rollback Monty's removals of explicit casts
tests/mysql_client_test.c:
  SCCS merged

6d1e66a3