mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49673 commits 2793 branches 343 tags 1.7 GiB
Commit graph

49673 commits

This branch
This branch
All branches
Author SHA1 Message Date
jani@a88-113-38-195.elisa-laajakaista.fi
b7231ad5d9 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-25 12:08:18 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
516cafdc79 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-25 11:39:56 +03:00
tsmith@ramayana.hindu.god
159d5b71b1 Apply InnoDB snapshot innodb-5.1-ss1726. 
Bug #16979: AUTO_INC lock in InnoDB works a table level lock
  - this is a major change in InnoDB auto-inc handling.
Bug #27950: Duplicate entry error in auto-inc after mysqld restart
  - Init AUTOINC from delete_row().
Bug #28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
  - Use value specified by MySQL, in update_row().
 2007-08-24 19:14:52 -06:00
davi@moksha.local
0b8bc8a96b Add test case for bug 29936 Stored Procedure DML ignores low_priority_updates setting. 
This test case uses the wait_condition helper (only available in 5.1) in order to wait till the select/update opens and locks the table.
 2007-08-24 19:17:29 -03:00
joerg@trift2.
b30fbfd3ca Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 23:47:31 +02:00
joerg@trift2.
d7c1a81136 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 23:40:36 +02:00
joerg@trift2.
ae77f187f5 Merge trift2.:/MySQL/M51/netware2-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 23:29:19 +02:00
joerg@trift2.
c6d2337b82 Merge trift2.:/MySQL/M51/netware2-5.1 
into  trift2.:/MySQL/M51/target-5.1.22
 2007-08-24 23:22:55 +02:00
joerg@trift2.
4d375e46e3 Merge trift2.:/MySQL/M50/netware2-5.0 
into  trift2.:/MySQL/M51/netware2-5.1
 2007-08-24 23:12:19 +02:00
joerg@trift2.
2fd45aaee6 Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0: 
1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
 2007-08-24 23:07:59 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
eb6651b017 ha_partition.cc, ha_partition.h: 
bug fixed
partition_pruning.result:
  test fixed
 2007-08-24 21:36:51 +05:00
malff/marcsql@weblab.(none)
1013eb57ce Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup
 2007-08-24 09:09:19 -06:00
malff/marcsql@weblab.(none)
162a1be4f9 Whitespace cleanup 2007-08-24 09:08:11 -06:00
msvensson@pilot.(none)
89780a84c8 Remove unsued variable $glob_hostname, unused functions 
'mtr_short_hostname' and 'mtr_full_hostname'
 2007-08-24 15:43:45 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
76835dbaae Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-24 15:26:48 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
b25dacbdee Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-08-24 15:25:02 +03:00
dfischer/mysqldev@production.mysql.com
81528c1a00 Merge bk-internal:/home/bk/mysql-5.0-build 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:47:11 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b356018839 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
 2007-08-24 14:43:33 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
74afbb4b7b Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
 2007-08-24 13:30:16 +02:00
msvensson@pilot.(none)
00e1c89fec Merge pilot.(none):/data/msvensson/mysql/bug30593/my51-bug30593 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-24 13:11:32 +02:00
msvensson@pilot.(none)
643ce3979f Merge pilot.(none):/data/msvensson/mysql/bug30593/my50-bug30593 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-24 13:11:14 +02:00
msvensson@pilot.(none)
52e60422e0 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-24 13:10:53 +02:00
msvensson@pilot.(none)
4fcea0fc5c Remove unecessary use of "Socket" 2007-08-24 13:10:34 +02:00
joerg@trift2.
9e33d39aeb Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 13:03:22 +02:00
joerg@trift2.
08d0b2ba9b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:41:09 +02:00
joerg@trift2.
c5b1ad99e4 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:38:26 +02:00
joerg@trift2.
e8aa23fae4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 12:34:45 +02:00
joerg@trift2.
268ce5eb7e Merge trift2.:/MySQL/M51/tmp-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 12:28:47 +02:00
joerg@trift2.
30433c29eb Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 11:09:18 +02:00
joerg@trift2.
17c6d765a5 Merge trift2.:/MySQL/pushed/netware-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-24 11:02:34 +02:00
joerg@trift2.
76a05d26d5 Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-24 10:58:14 +02:00
joerg@trift2.
e9b971610f Merge trift2.:/MySQL/pushed/netware-5.0 
into  trift2.:/MySQL/pushed/netware-5.1
 2007-08-24 10:50:11 +02:00
joerg@trift2.
aa588114a2 NetWare packages were missing the scripts to initialize the database: add them. 2007-08-24 10:47:13 +02:00
df@pippilotta.erinye.com
66158ad912 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-24 10:14:08 +02:00
df@pippilotta.erinye.com
6d068a5ac7 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-24 10:13:03 +02:00
df@pippilotta.erinye.com
30435b43f2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-08-24 09:55:47 +02:00
tomas@whalegate.ndb.mysql.com
7f429ecc7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
 2007-08-24 09:51:41 +02:00
tomas@whalegate.ndb.mysql.com
af5a367311 unable to reproduce bug, perhaps pushbuild can give more info 2007-08-24 09:50:54 +02:00
thek@adventure.(none)
1e43e5402a Merge adventure.(none):/home/thek/Development/cpp/bug28285/my51-bug28285 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-24 09:44:22 +02:00
holyfoot/hf@hfmain.(none)
c4811d67f7 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28430/my51-28430
 2007-08-24 07:51:58 +05:00
gshchepa@bk-internal.mysql.com
64bcb0daaf Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-08-23 23:27:30 +02:00
gshchepa/uchum@gleb.loc
72bcbc655e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  gleb.loc:/home/uchum/work/bk/target-5.1.22/mysql-5.1-target-5.1.22
 2007-08-24 02:26:30 +05:00
gshchepa/uchum@gleb.loc
4a7fdf8611 Fixed bug #30396. 
Recommit to 5.1.22.
The bug caused memory corruption for some queries with top OR level
in the WHERE condition if they contained equality predicates and 
other sargable predicates in disjunctive parts of the condition.

The corruption happened because the upper bound of the memory
allocated for KEY_FIELD and SARGABLE_PARAM internal structures
containing info about potential lookup keys was calculated incorrectly
in some cases. In particular it was calculated incorrectly when the
WHERE condition was an OR formula with disjuncts being AND formulas
including equalities and other sargable predicates.
 2007-08-24 02:23:49 +05:00
gshchepa/uchum@gleb.loc
6e76e82e8b Fixed bug #30201. 
Recommit to 5.1.22.
Killing a SELECT query with KILL QUERY or KILL CONNECTION
causes a server crash if the query cache is enabled.

Normal evaluation of a query may be interrupted by the
KILL QUERY/CONNECTION statement, in this case the mysql_execute_command
function returns TRUE, and the thd->killed flag has true value.
In this case the result of the query may
be cached incompletely (omitting call to query_cache_insert inside
the net_real_write function), and next call to query_cache_end_of_result
may lead to server crash.
Thus, the query_cache_end_of_result function has been modified to abort
query cache in the case of killed thread.
 2007-08-24 01:59:48 +05:00
gshchepa/uchum@gleb.loc
e543c7436e Fixed bug #30287. 
Recommit to 5.1.22.
The server created temporary tables for filesort in the working directory
instead of the specified tmpdir directory.
 2007-08-24 01:54:18 +05:00
msvensson@pilot.(none)
ae16a5abf8 Merge pilot.(none):/data/msvensson/mysql/bug30593/my50-bug30593 
into  pilot.(none):/data/msvensson/mysql/bug30593/my51-bug30593
 2007-08-23 22:30:57 +02:00
gshchepa@bk-internal.mysql.com
46e58466cb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/users/gshchepa/mysql-5.1-opt
 2007-08-23 21:38:24 +02:00
gshchepa@bk-internal.mysql.com
c70dbeab8b Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt
 2007-08-23 21:28:33 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
afe7de8234 Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format. 
In the ha_partition::position() we didn't calculate the number
of the partition of the record. We used m_last_part value instead,
relying on that it is set in other place like previous call of a method
like ::write_row(). In replication we don't call any of these befor
position(). Delete_rows_log_event::do_exec_row calls find_and_fetch_row.
In case of InnoDB-based PARTITION table, we have HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
enabled, so use position() / rnd_pos() calls to fetch the record.

Fixed by adding partition_id calculation to the ha_partition::position()
 2007-08-23 23:34:48 +05:00
msvensson@pilot.(none)
e1b9e55a5a Bug#30593 No cipher list returned for "SHOW STATUS LIKE 'Ssl_cipher_list'" 
- Move increment of "i" to "increment section" of for loop
 - Protect against writing after end of "buff"(backport from 5.1)
 2007-08-23 20:24:48 +02:00