Commits · 5d6e7a001679c98a45529c11aee1b2c34afc2b4d · Kirill Smelkov / mariadb

06 Jul, 2006 2 commits

Merge chilla.local:/home/mydev/mysql-5.0 · 5d6e7a00

unknown authored Jul 06, 2006

into  chilla.local:/home/mydev/mysql-5.0-ateam


libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge
mysql-test/r/key.result:
  Manual merge
mysql-test/t/ctype_utf8.test:
  Manual merge

5d6e7a00

Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · cee36215

unknown authored Jul 05, 2006

into  xiphis.org:/home/antony/work2/p2-bug8706.3-merge-5.0


configure.in:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

cee36215

05 Jul, 2006 5 commits

After merge fix · d87e4fbf
unknown authored Jul 05, 2006

d87e4fbf
Merge mysql.com:/home/mydev/mysql-4.1-bug19835 · 55736ce5
unknown authored Jul 05, 2006
```
into  mysql.com:/home/mydev/mysql-5.0-ateam


myisam/mi_dynrec.c:
  Auto merged
```
55736ce5

Merge mysql.com:/home/mydev/mysql-4.1-bug17877 · a4a905f3

unknown authored Jul 05, 2006

into  mysql.com:/home/mydev/mysql-5.0-ateam


myisam/mi_key.c:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
myisam/mi_check.c:
  SCCS merged

a4a905f3

Merge mysql.com:/home/mydev/mysql-4.1-bug14400 · fef31470

unknown authored Jul 05, 2006

into  mysql.com:/home/mydev/mysql-5.0-ateam


libmysqld/libmysqld.c:
  Auto merged
myisam/mi_rkey.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
libmysqld/lib_sql.cc:
  Manual merge
mysql-test/r/func_time.result:
  Manual merge
mysql-test/r/gis.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge
mysql-test/t/gis.test:
  Manual merge
sql-common/client.c:
  Manual merge

fef31470

Merge mysql.com:/home/mydev/mysql-4.1-bug11824 · 516fdb71

unknown authored Jul 05, 2006

into  mysql.com:/home/mydev/mysql-5.0-ateam


myisam/mi_create.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/field.cc:
  Manual merge

516fdb71

04 Jul, 2006 6 commits

Merge mysql.com:/home/mydev/mysql-4.0-bug14400 · 752b826e

unknown authored Jul 04, 2006

into  mysql.com:/home/mydev/mysql-4.1-bug14400


myisam/mi_rkey.c:
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  Manual merge
sql/sql_class.cc:
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  Manual merge

752b826e

ndb - ps_7ndb as discovered by pb · 95e37a4a

unknown authored Jul 04, 2006

  fix race in scan close


ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix race in scan close

95e37a4a

Merge tomas@poseidon:mysql-5.0-main · 05348e41
unknown authored Jul 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
05348e41

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 19096dc0

unknown authored Jul 04, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_update.cc:
  Auto merged

19096dc0

Bug #20784 Uninitialized memory in update on table with PK not on first column · 8597f663
unknown authored Jul 04, 2006
```
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
```
8597f663
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 27181aa1
unknown authored Jul 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
27181aa1

03 Jul, 2006 2 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 06af76d2
unknown authored Jul 03, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
```
06af76d2

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3e085bd8

unknown authored Jul 03, 2006

into mysql.com:/home/gluh/MySQL/Merge/5.0-kt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

3e085bd8

01 Jul, 2006 3 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c2db1be

unknown authored Jul 01, 2006

into  mysql.com:/opt/local/work/mysql-5.0-runtime


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

4c2db1be

Post-merge fix · 047e2be2
unknown authored Jul 01, 2006

047e2be2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 87d04015
unknown authored Jul 01, 2006
```
into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge
```
87d04015

30 Jun, 2006 22 commits

Merge mysql.com:/home/psergey/mysql-4.1-bug16168-push · c1fa66c3

unknown authored Jul 01, 2006

into  mysql.com:/home/psergey/mysql-5.0-bug16168-merge


mysql-test/t/range.test:
  Auto merged
mysql-test/r/range.result:
  SCCS merged
sql/opt_range.cc:
  SCCS merged

c1fa66c3

Remove an unused variable. · 697e8d71
unknown authored Jul 01, 2006

697e8d71

Remove a couple of unused/barely used names. · 0c7bc6e9

unknown authored Jul 01, 2006


sql/sql_lex.cc:
  Remove an unused thread key.
sql/sql_lex.h:
  Remove an unused thread key, current_lex.
sql/sql_parse.cc:
  Remove an unused thread key, current_lex macro.

0c7bc6e9

After merge fixes · 0bbc6fbe

unknown authored Jun 30, 2006


BitKeeper/etc/ignore:
  added scripts/mysql_upgrade_shell
include/my_handler.h:
  my_handler.h should not include my_global.h
mysql-test/r/key.result:
  Update results after merge

0bbc6fbe

Merge mysql.com:/home/my/mysql-4.1 · 9606675b

unknown authored Jun 30, 2006

into  mysql.com:/home/my/mysql-5.0


libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/key.test:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/key.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
  (Now we have same code as in 4.1 and 5.1)
sql/ha_ndbcluster.cc:
  Manual merge
  Change %ll -> llstr()
tests/mysql_client_test.c:
  manual merge

9606675b

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e0171231
unknown authored Jun 30, 2006
```
into  mysql.com:/home/my/mysql-4.1
```
e0171231
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a6d2cafd
unknown authored Jun 30, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
```
a6d2cafd

Reverted wrong bug fix (Bug#11228) · 66a59b10

unknown authored Jun 30, 2006


mysql-test/r/key.result:
  Fixed result after removing wrong bug fix
mysql-test/t/key.test:
  Added SHOW CREATE TABLE, which is the proper way to check for table definitions
sql/table.cc:
  Reverted wrong bug fix.
  The intention with the original code was to show that MySQL treats the first
  given unique key as a primary key. Clients can use the marked primary key as a
  real primary key to validate row changes in case of conflicting updates.  The
  ODBC driver (and other drivers) may also use this fact to optimize/check
  updates and handle conflicts.  The marked key also shows what some engines, like InnoDB or NDB,
  will use as it's internal primary key.
  
  For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'

66a59b10

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · baa7f2a3
unknown authored Jun 30, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
```
baa7f2a3
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · c0f77ca3
unknown authored Jun 30, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
```
c0f77ca3
manual merge, patch only relevant for 4.1 · c8ddbe6d
unknown authored Jun 30, 2006

c8ddbe6d
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · e410532a
unknown authored Jun 30, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main


sql/ha_ndbcluster.cc:
  Auto merged
```
e410532a
adopted ndb handler code for tables without primary key and with unique index · 437afbfd
unknown authored Jun 30, 2006
```
- added missing retrieval of hidden primary key
```
437afbfd

Bug#17226: Variable set in cursor on first iteration is assigned · fc085d77

unknown authored Jun 30, 2006

           second iterations value

During assignment to the BLOB variable in routine body the value
wasn't copied.


mysql-test/r/sp-vars.result:
  Add result for bug#17226.
mysql-test/t/sp-vars.test:
  Add test case for bug#17226.
sql/field_conv.cc:
  Honor copy_blobs flag.

fc085d77

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 250ea729

unknown authored Jun 30, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

250ea729

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6fd86971
unknown authored Jun 30, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
6fd86971

Merge mysqldev@production:my/mysql-5.0-release · b138b55d

unknown authored Jun 30, 2006

into  mysql.com:/usr/local/mysql/tmp-5.0


include/my_global.h:
  Auto merged
sql/item_sum.cc:
  Auto merged

b138b55d

Fix Windows build problem following previous push. · 949ad5b4
unknown authored Jun 30, 2006
```
strings/strtod.c:
  Fix Windows build problem, EOVERFLOW is defined in my_base.h on Windows.
```
949ad5b4
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1 · 618bd69d
unknown authored Jun 30, 2006
```
into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug20152
```
618bd69d

bug #20152: mysql_stmt_execute() overwrites parameter buffers · 86155590

unknown authored Jun 30, 2006

When using a parameter bind MYSQL_TYPE_DATE in a prepared statement,
the time part of the MYSQL_TIME buffer was written to zero in
mysql_stmt_execute(). The param_store_date() function in libmysql.c
worked directly on the provided buffer.
Changed to use a copy of the buffer.


libmysql/libmysql.c:
  fix for bug #20152
tests/mysql_client_test.c:
  added test for bug#20152

86155590

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 79bb7035

unknown authored Jun 30, 2006

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

79bb7035

ndb - bug#20774 · 652a02f6

unknown authored Jun 30, 2006

  crash if system restart with more than 4096 fragments
  solution: continueb enable expand check loop


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  continueb enable expand check loop
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  continueb enable expand check loop

652a02f6