1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-07 17:42:39 +03:00
Commit Graph

16905 Commits

Author SHA1 Message Date
msvensson@pilot.blaudden
dc01a80c37 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:55:09 +02:00
msvensson@pilot.blaudden
cb806be68d Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:48:05 +02:00
msvensson@pilot.blaudden
f47c4368de Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309
into  pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
2007-03-29 11:38:48 +02:00
msvensson@pilot.blaudden
37ffc0c391 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:37:21 +02:00
msvensson@pilot.blaudden
0e04aec960 Make the script detect --default-storage-engine=x and
mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster
2007-03-29 11:31:50 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
95b58449f9 Merge mysql.com:/home/ram/work/b26359/b26359.5.0
into  mysql.com:/home/ram/work/b26359/b26359.5.1
2007-03-29 09:38:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e3c34c9cbf Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode

Problems: 
1. storing a string to an integer field we don't check 
   if strntoull10rnd() returns MY_ERRNO_EDOM error.
   Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
   Fix: use strntoull10rnd() instead.
2007-03-29 09:08:30 +05:00
tsmith@siva.hindu.god
0d65ee796b Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 19:50:41 -06:00
tsmith@siva.hindu.god
d4e0de8fda Update test for bug #24563 (MBROverlaps does not seem to function propertly.); ARCHIVE doesn't support AUTO_INCREMENT, so specify PK values explicitly 2007-03-28 19:39:43 -06:00
tsmith@siva.hindu.god
5aa073b1e4 Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 17:41:52 -06:00
tsmith@siva.hindu.god
8350721c88 Update test for bug #24563 (MBROverlaps does not seem to function propertly.):
- Add primary key to test table, so NDB with binlog doesn't complain
- Add extra results for bdb_gis.result
2007-03-28 17:40:42 -06:00
tsmith@siva.hindu.god
7366ecdb0e Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-03-28 12:27:37 -06:00
tsmith@siva.hindu.god
c01629a7cd Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 11:47:28 -06:00
msvensson@pilot.blaudden
1ccf651a3a Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 15:57:27 +02:00
msvensson@pilot.blaudden
c2bbf3c05e Add back the look for exe_mysql 2007-03-28 15:56:57 +02:00
msvensson@pilot.blaudden
aec7927c8e Bug#25309 SSL connections without CA certificate broken since MySQL 5.0.23
- Turn off verification of peer if both ca_path and ca_file is null
   i.e from only passing --ssl-key=<client_key> and --ssl-cert=<client_cert>
   to the mysql utility programs.
   The server will authenticate the client accoring to GRANT tables
   but the client won't authenticate the server
2007-03-28 12:23:55 +02:00
msvensson@pilot.blaudden
6969acd293 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 11:17:08 +02:00
msvensson@pilot.blaudden
1577caab52 Turn off im if extern
Remove strange comment
Add run_query function
2007-03-28 11:16:50 +02:00
msvensson@pilot.blaudden
184fef6303 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 10:24:47 +02:00
msvensson@pilot.blaudden
5901765694 Dont' redirect stderr in ActiveState perl
Improve comments
2007-03-28 10:24:33 +02:00
msvensson@pilot.blaudden
feac555a63 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 10:18:35 +02:00
msvensson@pilot.blaudden
a1a664ebf7 Use mtr_verbose instead of "if ($opt_verbose)" 2007-03-28 10:08:26 +02:00
msvensson@pilot.blaudden
164397e71f Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 09:35:03 +02:00
msvensson@pilot.blaudden
8c5be6a220 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-28 09:34:04 +02:00
msvensson@pilot.blaudden
bed4cb75e4 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
into  pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197
2007-03-28 09:33:16 +02:00
msvensson@pilot.blaudden
171e91f17d Bug#25197 repeat function returns null when using table field directly as count
- Add extra test case from bug#27073
 - Change "if" to be optimized for count > 0
2007-03-28 09:32:49 +02:00
msvensson@pilot.blaudden
2600dade72 Remove remnants of ssl_des.test 2007-03-27 21:29:45 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d0ed1216e2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b25301/b25301.5.0
2007-03-26 13:43:20 +05: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
tsmith@siva.hindu.god
bd5012a8ca Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
2007-03-23 17:48:03 -06:00
tsmith@siva.hindu.god
47cce188b3 Bug #24563: MBROverlaps does not seem to function propertly.
Fix is to rewrite the MBR::overlaps() function, to compute the dimension of both
arguments, and the dimension of the intersection; test that all three dimensions are the
same (e.g., all are Polygons).

Add tests for all MBR* functions for various combinations of shapes, lines and points.
2007-03-23 16:28:07 -06: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
c4e20a9c39 Bug #27070 server logs are created unrequested and in wrong directory 2007-03-23 13:39:16 +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
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
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
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
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
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
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
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