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

15289 commits

Author SHA1 Message Date
tsmith@ramayana.hindu.god
d70e4b0c92 Correct test result file for bug #27014 2007-08-31 05:21:12 -06:00
tsmith@ramayana.hindu.god
47dc161f5b Fix test results for bug #27014 2007-08-31 01:28:42 -06:00
msvensson@pilot.(none)
61dbfb3a01 Move instance manager tests to it's own suite 2007-08-29 19:02:33 +02:00
tsmith@ramayana.hindu.god
a009144d43 Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:41:29 -06:00
tsmith@ramayana.hindu.god
c87236ce91 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:20:54 -06:00
tsmith@ramayana.hindu.god
2c44def1ee Bug #30389: connection_id() always return 0 in embedded server 
Initialize thd->variables.pseudo_thread_id when a new embedded
thd is created.
 2007-08-27 14:31:27 -06:00
tsmith@ramayana.hindu.god
c0fd09224b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22 
into  ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
 2007-08-27 14:23:02 -06:00
baker@bk-internal.mysql.com
25c467bf6f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-08-27 20:20:08 +02:00
msvensson@pilot.(none)
e6b50eb51b Bug#30487 mysql_upgrade reports misleading errors 
- Update result file to include these "misleading errors", better to 
run mysql_upgrade with them than not at all.
 2007-08-27 11:27:03 +02:00
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
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
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
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
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
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/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@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
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
joerg@trift2.
d4d4f8528e Manual merge of parallel development in separate team trees. 2007-08-22 17:13:42 +02:00
jani@hynda.mysql.fi
6519de0469 Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-22 17:29:38 +03:00
joerg@trift2.
20ce606797 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1

Includes manual merges.
 2007-08-22 16:08:55 +02:00
joerg@trift2.
36cba7ce09 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/target-5.1.22
 2007-08-22 15:49:00 +02:00
joerg@trift2.
057c591e29 Merge trift2.:/MySQL/M51/target-5.1.22 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-22 15:43:01 +02:00
jani@hynda.mysql.fi
2cb4a2c0b6 Removed a test which output may differ depending on machine load. 2007-08-22 16:18:27 +03:00
jani@hynda.mysql.fi
2fd7a743e4 Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-21 19:03:28 +03:00
gluh@eagle.(none)
86d6897087 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-08-21 17:57:09 +05:00
gluh@mysql.com/eagle.(none)
69970f5248 Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements(addon for 5.1) 
added TRIGGER_ACL check for I_S.TRIGGERS
 2007-08-21 17:55:49 +05:00
thek@adventure.(none)
400aec95f7 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-21 14:54:09 +02:00
thek@adventure.(none)
588a528f5a Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-21 14:04:31 +02:00
thek@adventure.(none)
1317079fd0 Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 
into  adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
 2007-08-21 13:44:01 +02:00
thek@adventure.(none)
acfe3fc924 Bug#30269 Query cache eats memory 
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
  
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions. 

Views are excepted and can be cached but only retrieved by super user account.
 2007-08-21 13:43:09 +02:00
gshchepa/uchum@gleb.loc
9de070f36b Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 16:38:29 +05:00
gshchepa/uchum@gleb.loc
be6ee4314e Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-21 16:16:50 +05:00
gluh@eagle.(none)
4ae4934856 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-08-21 16:01:47 +05:00
malff/marcsql@weblab.(none)
c76cd081d8 Fixed 5.0 -> 5.1 merge 2007-08-20 17:50:42 -06:00
malff/marcsql@weblab.(none)
a01da34f72 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-08-20 16:13:54 -06:00
baker@bk-internal.mysql.com
9977898bd7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-08-20 22:25:52 +02:00
malff/marcsql@weblab.(none)
1c27dd1d67 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-08-20 11:13:31 -06:00
malff/marcsql@weblab.(none)
8d507c5897 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-08-20 10:45:16 -06:00
msvensson@pilot.(none)
346e565981 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:48:46 +02:00
msvensson@pilot.(none)
d2fdcd908a Merge pilot.(none):/data/msvensson/mysql/work/my51-work 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:47:31 +02:00
gluh@eagle.(none)
6dda1f8be1 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-08-20 11:25:45 +05:00
gluh@mysql.com/eagle.(none)
7a8fd4107d Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements 
added SUPER_ACL check for I_S.TRIGGERS
 2007-08-20 11:23:08 +05:00
tsmith@ramayana.hindu.god
76d173fa9d Bug #29307: status.test fails with different Table_locks_immediate 
Finish premature patch which was accidentally pushed; remove debugging
info and correct the test.
 2007-08-18 02:28:08 -06:00
tsmith@ramayana.hindu.god
a7b5c540ba Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-18 00:36:18 -06:00
tsmith@ramayana.hindu.god
88444351c2 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-18 00:35:41 -06:00
thek@adventure.(none)
4b6c103f09 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-17 17:34:18 +02:00
thek@adventure.(none)
35533f9d8f Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-08-17 17:27:41 +02:00
thek@adventure.(none)
c12feca450 Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-08-17 17:26:38 +02:00
thek@adventure.(none)
5d5519edde Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269 
into  adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
 2007-08-17 16:59:20 +02:00