Commits · 04ade50c2152f6ee47e3dd21673205ef11d4d409 · Kirill Smelkov / mariadb

19 Apr, 2007 26 commits

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint--pthreadkeycreate · 04ade50c
unknown authored Apr 19, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


mysys/my_thr_init.c:
  Auto merged
```
04ade50c

Bug #27964: pthread_key_create doesn't set errno, so don't report \ · 0732ad9a

unknown authored Apr 19, 2007

	errno

Vasil Dimov (at Oracle) noted that pthread_key_create() does not
set errno, so if it fails then we return the wrong error code.

Instead, capture the return value, which is the real error value, 
and instead report that.


mysys/my_thr_init.c:
  pthread functions don't set the global errno, which should be
  obvious.

0732ad9a

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 45f710a9

unknown authored Apr 19, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


client/mysql.cc:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge

45f710a9

innodb_mysql.test, innodb_mysql.result: · f4d6b5de

unknown authored Apr 19, 2007

  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE


mysql-test/r/innodb_mysql.result:
  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE
mysql-test/t/innodb_mysql.test:
  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE

f4d6b5de

Post-merge fix of innodb.result · ef65fdb0
unknown authored Apr 19, 2007
```
mysql-test/r/innodb.result:
  Move test result after incorrect merge
```
ef65fdb0

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · f7027dba

unknown authored Apr 19, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged

f7027dba

mysql_upgrade must depend on GenFixPrivs · 9f33362d
unknown authored Apr 19, 2007

9f33362d
mysql_upgrade depends on GenFixPrivs · ffd062f7
unknown authored Apr 19, 2007

ffd062f7

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 4de3d26b

unknown authored Apr 19, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged

4de3d26b

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 10de18a5

unknown authored Apr 19, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

10de18a5

Build zlib before extra since extra/comp_err uses zlib · dea53d61
unknown authored Apr 19, 2007

dea53d61

mysql_upgrade win fixes · 4fff310e

unknown authored Apr 19, 2007


client/mysql_upgrade.c:
  Windows fix
scripts/CMakeLists.txt:
  Fix problems with CMakeList causing build to fail
scripts/comp_sql.c:
  Improve comp_sql.c to generate output file with shorter strings

4fff310e

Merge mysql.com:/home/ram/work/mysql-5.0-maint · 0a3533ff
unknown authored Apr 19, 2007
```
into  mysql.com:/home/ram/work/b26851/b26851.5.0
```
0a3533ff
Merge mysql.com:/home/ram/work/mysql-5.1-maint · 6a313bce
unknown authored Apr 19, 2007
```
into  mysql.com:/home/ram/work/b26851/b26851.5.1
```
6a313bce

Merge mysql.com:/home/ram/work/mysql-5.0-maint · 5198d0b4

unknown authored Apr 19, 2007

into  mysql.com:/home/ram/work/b22824/my50-b22824


sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/strict.result:
  merging
mysql-test/t/strict.test:
  merging

5198d0b4

Merge mysql.com:/home/ram/work/mysql-5.0-maint · 30f3f3a0
unknown authored Apr 19, 2007
```
into  mysql.com:/home/ram/work/b26851/b26851.5.0


client/mysql.cc:
  Auto merged
```
30f3f3a0

Merge mysql.com:/home/ram/work/b26851/b26851.5.0 · b14a8f8d

unknown authored Apr 19, 2007

into  mysql.com:/home/ram/work/b26851/b26851.5.1


client/mysql.cc:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged

b14a8f8d

Merge mysql.com:/home/ram/work/b22824/my50-b22824 · 0bc7d9cc

unknown authored Apr 19, 2007

into  mysql.com:/home/ram/work/b22824/my51-b22824


mysql-test/r/strict.result:
  merging
mysql-test/t/strict.test:
  merging
sql/item_cmpfunc.cc:
  merging

0bc7d9cc

Post-push fix of client/mysqltest.c oops. · 74192cf9

unknown authored Apr 18, 2007


client/mysqltest.c:
  Actually include "client_priv.h", as intended in previous changeset.

74192cf9

Move WEXITSTATUS #define from mysqltest.c to client_priv.h, and · c6e95257

unknown authored Apr 18, 2007

include client_priv.h in mysqltest.c.  Portability fix.


client/client_priv.h:
  Include client_priv.h, for WEXITSTATUS definition.
  
  Remove code which is already in client_priv.h.
  
  Rearrange OPT_* enum to co-exist with options defined in client_priv.h.
client/mysqltest.c:
  Move WEXITSTATUS #define from mysqltest.c to client_priv.h, as it is
  useful in other clients (in particular, current mysql_upgrade.c won't
  compile without it on some platforms).
  
  Add a final OPT_MAX_CLIENT_OPTION to enum options_client, which can
  be used when a maximum shared client option value is needed.

c6e95257

Merge siva.hindu.god:/home/tsmith/m/inno/apr18/50 · 88cd3333
unknown authored Apr 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/inno/apr18/51
```
88cd3333
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4e52ac1f
unknown authored Apr 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/inno/apr18/51
```
4e52ac1f
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 39754b24
unknown authored Apr 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/inno/apr18/50
```
39754b24

Merge siva.hindu.god:/home/tsmith/m/inno/apr18/50 · f1ca7795

unknown authored Apr 18, 2007

into  siva.hindu.god:/home/tsmith/m/inno/apr18/51


BitKeeper/deleted/.del-configure.in:
  Use local
mysql-test/r/innodb.result:
  Use local
mysql-test/t/innodb.test:
  Use local
mysys/my_alloc.c:
  SCCS merged
sql/ha_ndbcluster.cc:
  SCCS merged
sql/item.cc:
  SCCS merged
sql/item_cmpfunc.cc:
  SCCS merged
sql/mysqld.cc:
  SCCS merged
sql/sql_delete.cc:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged
storage/innobase/handler/ha_innodb.cc:
  Use local
storage/innobase/handler/ha_innodb.h:
  Use local
storage/innobase/os/os0file.c:
  Use local

f1ca7795

Applied innodb-5.1-ss1404 snapshot · 619c11cb

unknown authored Apr 18, 2007

Fixes:

- Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
  Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
  this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
- Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
- Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
  Report the current value of the AUTO_INCREMENT counter to MySQL.


mysql-test/r/innodb.result:
  Applied innodb-5.1-ss1404 snapshot
  
  Revision r1404:
  Report the current value of the AUTO_INCREMENT counter to MySQL.
  (Bug #23313, Bug #21404)
  
  ha_innobase::update_create_info(): New function, to report
  the auto_increment_value.
mysql-test/t/innodb.test:
  Applied innodb-5.1-ss1404 snapshot
  
  Revision r1404:
  Report the current value of the AUTO_INCREMENT counter to MySQL.
  (Bug #23313, Bug #21404)
  
  ha_innobase::update_create_info(): New function, to report
  the auto_increment_value.
storage/innobase/handler/ha_innodb.cc:
  Applied innodb-5.1-ss1404 snapshot
  
  Revision r1404:
  Report the current value of the AUTO_INCREMENT counter to MySQL.
  (Bug #23313, Bug #21404)
  
  ha_innobase::update_create_info(): New function, to report
  the auto_increment_value.
storage/innobase/handler/ha_innodb.h:
  Applied innodb-5.1-ss1404 snapshot
  
  Revision r1404:
  Report the current value of the AUTO_INCREMENT counter to MySQL.
  (Bug #23313, Bug #21404)
  
  ha_innobase::update_create_info(): New function, to report
  the auto_increment_value.
storage/innobase/os/os0file.c:
  Applied innodb-5.1-ss1404 snapshot
  
  Revision r1395:
  * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
  to set this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
  
  * Add support for skipping the OS caching on Solaris by calling directio()
  instead of fcntl().
  
  Approved by:	Heikki
  
  
  
  Revision r1391:
  Merge the bodies of os_file_handle_error() and os_file_handle_error_no_exit()
  into a generic function which is called from both os_file_handle_error() and
  os_file_handle_error_no_exit()
  
  Approved by:	Marko
storage/innobase/plug.in:
  Applied innodb-5.1-ss1404 snapshot
  
  Revision r1395:
  * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
  to set this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
  
  * Add support for skipping the OS caching on Solaris by calling directio()
  instead of fcntl().
  
  Approved by:	Heikki

619c11cb

Apply innodb-5.0-ss1405 snapshot · 726d27ee

unknown authored Apr 18, 2007

NULL MERGE: this ChangeSet will be null merged into mysql-5.1

Fixes:

- Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
  Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
  this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
- Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
- Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
  Report the current value of the AUTO_INCREMENT counter to MySQL.


innobase/configure.in:
  Apply innodb-5.0-ss1405 snapshot
  
  Revision r1396:
  branches/5.0: Merge r1395 from trunk:
  
  * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
  to set this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
  
  * Add support for skipping the OS caching on Solaris by calling directio()
  instead of fcntl().
innobase/os/os0file.c:
  Apply innodb-5.0-ss1405 snapshot
  
  Revision r1394:
  branches/5.0: Merge r1391 from trunk:
  
  Merge the bodies of os_file_handle_error() and os_file_handle_error_no_exit()
  into a generic function which is called from both os_file_handle_error() and
  os_file_handle_error_no_exit()
  
  
  Revision r1396:
  branches/5.0: Merge r1395 from trunk:
  
  * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2)
  to set this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
  
  * Add support for skipping the OS caching on Solaris by calling directio()
  instead of fcntl().
mysql-test/r/innodb.result:
  Apply innodb-5.0-ss1405 snapshot
  
  Revision r1405:
  branches/5.0: Merge r1404 from trunk:
  
  Report the current value of the AUTO_INCREMENT counter to MySQL.
  (Bug #23313, Bug #21404)
  
  ha_innobase::update_create_info(): New function, to report
  the auto_increment_value.
mysql-test/t/innodb.test:
  Apply innodb-5.0-ss1405 snapshot
  
  Revision r1405:
  branches/5.0: Merge r1404 from trunk:
  
  Report the current value of the AUTO_INCREMENT counter to MySQL.
  (Bug #23313, Bug #21404)
  
  ha_innobase::update_create_info(): New function, to report
  the auto_increment_value.
sql/ha_innodb.cc:
  Apply innodb-5.0-ss1405 snapshot
  
  Revision r1405:
  branches/5.0: Merge r1404 from trunk:
  
  Report the current value of the AUTO_INCREMENT counter to MySQL.
  (Bug #23313, Bug #21404)
  
  ha_innobase::update_create_info(): New function, to report
  the auto_increment_value.
sql/ha_innodb.h:
  Apply innodb-5.0-ss1405 snapshot
  
  Revision r1405:
  branches/5.0: Merge r1404 from trunk:
  
  Report the current value of the AUTO_INCREMENT counter to MySQL.
  (Bug #23313, Bug #21404)
  
  ha_innobase::update_create_info(): New function, to report
  the auto_increment_value.

726d27ee

18 Apr, 2007 14 commits

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint · d6e07dc2

unknown authored Apr 18, 2007

into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint


Makefile.am:
  Auto merged
configure.in:
  Auto merged

d6e07dc2

Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2 · d429061d
unknown authored Apr 18, 2007
```
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint


configure.in:
  Auto merged
```
d429061d

Fixed make distcheck problem. · ad4922ef

unknown authored Apr 18, 2007


Makefile.am:
  Removed debian/control creation from the top level dist-hook
configure.in:
  Create debian/control from configure again
debian/rules:
  Protect debian/control from the debuild distclean run. 
  Prevent a makefile variable loop when settin MYSQL_BASE_VERSION

ad4922ef

Merge siva.hindu.god:/home/tsmith/m/bk/51 · 4177856a

unknown authored Apr 18, 2007

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


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysys/my_alloc.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

4177856a

Merge siva.hindu.god:/home/tsmith/m/bk/50 · 6ff11d70

unknown authored Apr 18, 2007

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


mysys/my_alloc.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

6ff11d70

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 9508b781
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/Makefile.am:
  Auto merged
```
9508b781
Add CMakeLists.txt to EXTRA_DIST · b4573eb4
unknown authored Apr 18, 2007

b4573eb4
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 214d2d1c
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
```
214d2d1c
Remove the check for value_start(if any it should be *value_start) · 1f949e08
unknown authored Apr 18, 2007

1f949e08

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 7eae11ad

unknown authored Apr 18, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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

7eae11ad

Use my_snprintf instead of snprintf · 87a05adf
unknown authored Apr 18, 2007

87a05adf
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 29b61191
unknown authored Apr 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
```
29b61191
Use my_snprintf instead of snprintf · aa043d73
unknown authored Apr 18, 2007

aa043d73
Add scripts/ subdiretory · c297a723
unknown authored Apr 18, 2007

c297a723