Commit graph

44374 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
0559be3469 Merge pilot.blaudden:/home/msvensson/mysql/bug24121/my50-bug24121
into  pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121
2007-03-27 19:26:28 +02:00
msvensson@pilot.blaudden
ad649e3c2c Bug#24121 Incorrect test for SSL_VERIFY_SERVER_CERT
- Interpret the pointer passed to 'mysql_options' for
   MYSQL_OPT_SSL_VERIFY_SERVER_CERT as a my_bool
 - In 5.1 the mysql_options signature will be chanegd to take
   a 'void*' in order to further emphasize the need for a pointer
   to correct type
2007-03-27 19:26:01 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
47b07aaa9f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b25301/b25301.5.1
2007-03-26 13:40:20 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
6baa89d054 after-merge fix: result adjusted. 2007-03-26 13:20:34 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
f5a24e5870 Merge mysql.com:/home/ram/work/b25993/b25993.5.0
into  mysql.com:/home/ram/work/b25993/b25993.5.1
2007-03-26 13:01:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
74b3cdb02e Fix for bug #25993: mysqldump crashes with merge table and -c option
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.
2007-03-26 12:56:41 +05:00
dkatz/Damien@damiendev.
6a7ef1849a bug#26346
Fix to a memory leak found by a complier warning.
2007-03-23 19:30:25 -04:00
dkatz/Damien@damiendev.
8cb8bf0ed0 Merge damiendev.:C:/build/dev50
into  damiendev.:C:/build/mysql-5.1
2007-03-23 18:22:57 -04:00
dkatz/Damien@damiendev.
53ecf4207e bug#26346
Added some fixes for an existing memory leak and unitilialized variables, both caught by gcc.
2007-03-23 18:15:11 -04:00
dkatz/Damien@damiendev.
772a76a78d Merge damiendev.:C:/build/dev50
into  damiendev.:C:/build/mysql-5.1
2007-03-23 13:47:50 -04:00
dkatz/Damien@damiendev.
b712e2fe28 Merge damiendev.:C:/build/mysql-5.0
into  damiendev.:C:/build/dev50
2007-03-23 13:43:46 -04:00
dkatz/Damien@damiendev.
7e063af361 Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  damiendev.:C:/build/mysql-5.1
2007-03-23 13:33:07 -04:00
msvensson@pilot.blaudden
f4ab12e859 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 17:15:44 +01:00
msvensson@pilot.blaudden
d8ab3024a4 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 16:44:33 +01:00
msvensson@pilot.blaudden
a1e7778642 Import patch from yaSSL after fixing warnings upstream 2007-03-23 16:41:17 +01:00
msvensson@pilot.blaudden
85aa1bec89 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 13:43:09 +01:00
msvensson@pilot.blaudden
c06e2804d3 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 13:40:57 +01:00
msvensson@pilot.blaudden
c4e20a9c39 Bug #27070 server logs are created unrequested and in wrong directory 2007-03-23 13:39:16 +01:00
msvensson@pilot.blaudden
552cb621d0 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 12:36:07 +01:00
msvensson@pilot.blaudden
a552a07c55 Backport from 5.1, limit SHOW VARIABLES to "log_bin%" 2007-03-23 12:35:30 +01:00
msvensson@pilot.blaudden
7216b67a8c Import yassl 1.6.0 2007-03-23 11:52:25 +01:00
msvensson@pilot.blaudden
da9fa2cfeb Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 11:31:22 +01:00
msvensson@pilot.blaudden
7dc48fd63b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 11:26:50 +01:00
msvensson@pilot.blaudden
aed2a676a7 Merge pilot.blaudden:/home/msvensson/mysql/bug26233/my50-bug26233
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 11:26:00 +01:00
msvensson@pilot.blaudden
fae5868936 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 11:19:57 +01:00
msvensson@pilot.blaudden
cd5e553267 Bug#27070 server logs are created unrequested and in wrong directory
- Add output path for slow queries as well
2007-03-23 11:18:59 +01:00
msvensson@pilot.blaudden
593ef42606 Bug#26233 very suspect code in mf_tempfile.c, in function create_temp_file()
- Rework the windows implementation in 'create_temp_file' to be
   thread safe by using GetTempFileName instad of fiddling
   with "environ"
2007-03-23 11:01:47 +01:00
Damien@damiendev.
ef3bbc426c additional changes to merge fix for bug 26346 2007-03-22 20:36:58 -04:00
Damien@damiendev.
db6f8d8ff8 Merge damiendev.:C:/build/mysql-5.1/..\dev50
into  damiendev.:C:/build/mysql-5.1
2007-03-22 20:08:05 -04:00
tsmith@siva.hindu.god
c3ba6eecf9 *
* NULL MERGE
*

Merge siva.hindu.god:/home/tsmith/m/inno/mar22/50
into  siva.hindu.god:/home/tsmith/m/inno/mar22/51

Null merge of innodb-5.0 snapshots.
2007-03-22 16:20:11 -06:00
tsmith@siva.hindu.god
baddc4e91c Apply the following InnoDB snapshots:
innodb-5.1-ss1318
innodb-5.1-ss1330
innodb-5.1-ss1332
innodb-5.1-ss1340

Fixes:
- Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
  At low transaction isolation levels we let each consistent read set
  its own snapshot.

- Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
  On Windows ut_usectime returns secs and usecs relative to the UNIX
  epoch (which is Jan, 1 1970).

- Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
  lock_deadlock_recursive(): When the search depth or length is exceeded,
  rewind lock_latest_err_file and display the two transactions at the
  point of aborting the search.

- Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
  Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
  there is a foreign key constraint ON ... SET NULL.

- Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
  The bug could be reproduced as follows:

  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.

  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.

  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.
2007-03-22 15:59:35 -06:00
tsmith@siva.hindu.god
8abc953662 NULL MERGE this to 5.1
Apply the following InnoDB snapshots:
innodb-5.0-ss1319
innodb-5.0-ss1331
innodb-5.0-ss1333
innodb-5.0-ss1341

Fixes:
- Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
  At low transaction isolation levels we let each consistent read set
  its own snapshot.
- Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
  On Windows ut_usectime returns secs and usecs relative to the UNIX
  epoch (which is Jan, 1 1970).

- Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
  lock_deadlock_recursive(): When the search depth or length is exceeded,
  rewind lock_latest_err_file and display the two transactions at the
  point of aborting the search.

- Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
  Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
  there is a foreign key constraint ON ... SET NULL.

- Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
  The bug could be reproduced as follows:

  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.

  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.

  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.
2007-03-22 14:40:52 -06:00
Damien@damiendev.
53679c03ad Merge damiendev.:C:/build/mysql-5.0
into  damiendev.:C:/build/dev50
2007-03-22 15:55:18 -04:00
tsmith@siva.hindu.god
de07f782a9 Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-22 11:48:49 -06:00
Damien@damiendev.
0fc5ad1e91 Bug#26346: stack + buffer overrun in mysqldump
Fixes to buffer overlows from long command line args, and unchecked dyn_str return codes. Also light refactoring.
2007-03-22 13:35:29 -04:00
jonas@perch.ndb.mysql.com
d645496ec5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-03-22 11:26:18 +01:00
jonas@perch.ndb.mysql.com
ca05bbf9d0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-03-22 11:25:29 +01:00
jonas@perch.ndb.mysql.com
702b5dad63 ndb -
fix test prg
2007-03-22 11:12:18 +01:00
tomas@whalegate.ndb.mysql.com
47834f3933 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-22 10:36:26 +01:00
tomas@whalegate.ndb.mysql.com
8b964c2b12 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-22 10:34:46 +01:00
tomas@whalegate.ndb.mysql.com
753bc96eca Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-22 10:33:26 +01:00
tomas@whalegate.ndb.mysql.com
6e7528bd34 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-22 05:45:17 +01:00
tomas@whalegate.ndb.mysql.com
6bab2f13b7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-22 05:44:39 +01:00
tsmith@quadxeon.mysql.com
c0d1f9fd46 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-22 01:22:22 +01:00
tsmith@quadxeon.mysql.com
54e7bc8daa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-22 01:04:39 +01:00
tsmith@quadxeon.mysql.com
4981d45997 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-21 23:58:02 +01:00
kostja@bodhi.local
f017117d84 Update the result file with an updated comment. 2007-03-22 00:11:58 +03:00
kostja@bodhi.local
9279170e69 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-22 00:11:11 +03:00
kostja@bodhi.local
54076b30d0 Try to fix events_logs_tests race on Windows. 2007-03-22 00:09:50 +03:00
kostja@bodhi.local
95597c8371 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-21 23:59:37 +03:00