database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-23 08:45:18 +03:00
Code Activity
192,192 Commits 3,119 Branches 357 Tags
adbad5e36f99f64eedbcc43f98215f5e52f10cad
Commit Graph

3654 Commits

Author SHA1 Message Date
Seppo Jaakola
7b791250a1 References lp:1051808 - merged with lp:maria/5.5 
bzr merge lp:maria/5.5
...
Text conflict in CMakeLists.txt
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_truncate.cc
4 conflicts encountered.
 2012-09-17 12:31:38 +03:00
Rohit Kalhans
4802faad3f upmerge to bug#14548159 2012-09-22 18:07:04 +05:30
Rohit Kalhans
1e5a759aff upmerge to bug#14548159 2012-09-22 18:07:04 +05:30
Tor Didriksen
50e8ac0b83 Bug#13734987 MEMORY LEAK WITH I_S/SHOW AND VIEWS WITH SUBQUERY 
In fill_schema_table_by_open(): free item list before restoring active arena.


sql/sql_show.cc:
  Replaced i_s_arena.free_items with DBUG_ASSERT(i_s_arena.free_list == NULL)
  (there's nothing to free in that list)
 2012-09-05 17:40:13 +02:00
Tor Didriksen
fe36ad9778 Bug#13734987 MEMORY LEAK WITH I_S/SHOW AND VIEWS WITH SUBQUERY 
In fill_schema_table_by_open(): free item list before restoring active arena.
 2012-09-05 17:40:13 +02:00
Igor Babaev
98f239a849 Merge 5.5->5.5-mwl248. 2012-08-29 18:50:38 -07:00
Michael Widenius
7dad536337 Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE to be able to distingus if a .frm file is missing or if the table is missing in the engine. 
sql/handler.cc:
  Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/rpl_record.cc:
  Fixed wrong printf
sql/share/errmsg-utf8.txt:
  Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sp.cc:
  Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sp_head.cc:
  Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sql_admin.cc:
  Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sql_base.cc:
  Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/sql_show.cc:
  Added ER_NO_SUCH_TABLE_IN_ENGINE
sql/table.cc:
  Fixed typo
 2012-08-28 19:39:49 +03:00
unknown
ced3907c02 Merge from 5.3 2012-08-24 15:29:01 +02:00
unknown
fc666a0df6 merge from 5.2 2012-08-24 14:02:32 +02:00
Tor Didriksen
e7f38f11eb merge 5.1 => 5.5 2012-09-05 17:43:58 +02:00
Tor Didriksen
775b1aebc2 merge 5.1 => 5.5 2012-09-05 17:43:58 +02:00
unknown
89e4d23f3b Merge into latest 5.2. 2012-08-24 12:57:19 +02:00
unknown
96703a63da Merge from 5.1. 2012-08-24 12:32:46 +02:00
unknown
4997ddfa9e Merge with latest 5.1. 2012-08-24 10:34:55 +02:00
unknown
cdeabcfd43 MDEV-382: Incorrect quoting 
Various places in the server replication code was incorrectly quoting
strings, which could lead to incorrect SQL on the slave/mysqlbinlog.
 2012-08-24 10:06:16 +02:00
Sergei Golubchik
1fd8150a5b 5.1 merge 
increase xtradb verson from 13.0 to 13.01
 2012-08-22 16:13:54 +02:00
Sergei Golubchik
cefc30b166 merge with MySQL 5.1.65 2012-08-22 11:40:39 +02:00
Igor Babaev
822e5da0d0 Merge 5.5->5.5-mwl248 2012-08-14 12:42:14 -07:00
Sergei Golubchik
d11829654c merge with MySQL 5.5.27 
manually checked every change, reverted incorrect or stupid changes.
 2012-08-09 17:22:00 +02:00
Seppo Jaakola
ebfa24b1d2 References lp:1034621 - Merge up to mysql-5.5.25 level 
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
   merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
 2012-08-09 01:47:21 +03:00
Sergey Petrunya
0e5193435a MWL#182: Explain running statements: Address feedback: 
- Use LEX::value_list instead of LEX::show_explain_for_thread
- Factor out common code into find_thread_by_id(ulong id)
 2012-08-08 21:24:00 +04:00
Sergey Petrunya
2b0f6ece7b Merge 5.5-main -> 5.5-show-explain 2012-07-25 20:53:49 +04:00
Sergey Petrunya
3956950b9f MDEV-408: SHOW EXPLAIN: Some values are chopped off in SHOW EXPLAIN output 
- Fix I_S table definition for EXPLAIN output.
 2012-07-24 14:02:53 +04:00
Sergey Petrunya
ab70b76d9c BUG#992942 & MDEV-325: Pre-liminary commit for testing 2012-07-19 15:52:19 +04:00
Sergey Petrunya
879069cada MWL#182: Explain running statements 
Address feedback from the second code review:
- Make SHOW EXPLAIN code convert the query string before pushing it as a warning text.
 2012-07-17 23:27:03 +04:00
Sergey Petrunya
2368f8895d MWL#182: Explain running statements 
- Address feedback from the second code review.
 2012-07-17 21:52:08 +04:00
Sergey Petrunya
725d76e1e8 MWL#182: Explain running statements: address review feedback 
- switch SHOW EXPLAIN to using an INFORMATION_SCHEMA table.
 2012-07-10 21:23:00 +04:00
Mayank Prasad
3a71ab0805 Bug#13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |HANDLE_FATAL_SIGNAL IN STRNLEN 
Follow up patch to resolve pb2 failure on windows platform
 2012-07-10 19:59:59 +05:30
Mayank Prasad
7dcc643d10 Bug#13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |HANDLE_FATAL_SIGNAL IN STRNLEN 
Follow up patch to resolve pb2 failure on windows platform
 2012-07-10 19:59:59 +05:30
Sergey Petrunya
ae3bc19161 Remove out-of-date comments. 2012-07-06 00:34:32 +04:00
Sergey Petrunya
3e90dc1f77 MWL#182: Explain running statements 
- Make SHOW EXPLAIN command be KILLable with KILL QUERY.
 2012-07-05 22:04:13 +04:00
Sergey Petrunya
b9093d370b MWL#182: Explain running statements: address review feedback 
- Fix the year in Monty Program Ab copyrights in the new files.
- Fix permissions handling so that SHOW EXPLAIN's handling is the 
  same as SHOW PROCESSLIST's.
 2012-06-29 22:17:16 +04:00
Sergey Petrunya
c62c0c5516 MWL#182: Explain running statements: address review feedback 
- Add Monty Program Ab copyright in new files
- Change Apc_target::make_apc_call() to accept a C++-style
  functor (instead of C-style function + parameter)
 2012-06-28 13:58:37 +04:00
Igor Babaev
4a6a08309c Merge 5.5 -> 5.5-mwl248. 2012-06-26 11:37:48 -07:00
Sergey Petrunya
66c62de103 MWL#182: Explain running statements 
- Remove out-of-date comments, add dbug assertions.
 2012-06-25 18:39:26 +04:00
Sergei Golubchik
0522307ed1 mysql-5.5 merge 2012-06-14 20:05:31 +02:00
Sergey Petrunya
5eecea8caf MDEV-324: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN for a query with TEMPTABLE view loses 'DERIVED' line 
- Make SHOW EXPLAIN code take into account that st_select_lex object without joins can be
  a full-featured SELECTs which were already executed and cleaned up.
 2012-06-07 19:55:22 +04:00
Sergey Petrunya
2c1e737c6c MDEV-297: SHOW EXPLAIN: Server gets stuck until timeout occurs while executing SHOW 
INDEX and SHOW EXPLAIN in parallel
- Rework locking code to use the LOCK_thd_data mutex for all synchronization. This also
  fixed MDEV-301.
 2012-06-07 12:19:06 +04:00
Sergei Golubchik
7f6f53a8df 5.2 merge 2012-05-20 14:57:29 +02:00
Igor Babaev
d48b4a83a2 Merge. 2012-05-18 09:50:30 -07:00
Sergei Golubchik
280fcf0808 5.1 merge 2012-05-18 14:23:05 +02:00
Igor Babaev
9b79feba56 Fixed the bug that caused displaying incorrect values in 
the column cardinality of the table information_schema.statistics.
 2012-05-17 16:54:26 -07:00
Sergei Golubchik
0a8c9b98f6 merge with mysql-5.1.63 2012-05-17 12:12:33 +02:00
Sergey Petrunya
34e9a4c1e2 Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5} 2012-05-17 00:59:03 +04:00
Sergey Petrunya
483ae4bf81 Make SHOW EXPLAIN give a separate timeout error. 2012-05-16 20:22:54 +04:00
Sergey Petrunya
dfbd777fd8 MWL#182: SHOW EXPLAIN: Merge 5.3->5.5 2012-05-16 19:20:00 +04:00
Seppo Jaakola
e001516351 Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5 2012-04-26 13:59:35 +03:00
Sergey Petrunya
ff40705f89 Make SHOW EXPLAIN FOR produce a warning with the original text of query 
that the EXPLAIN is for.
 2012-04-26 08:48:31 +05:30
Sergey Petrunya
ca8aa3901c MWL#182: Explain running statements 
- Code cleanup
 2012-04-26 06:40:36 +05:30
Mayank Prasad
a7d47adf23 BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHE 
Details:
- Merge : 5.1 -> 5.5
- Addded a new test case which was not added in 5.1 because PS was
  not there in 5.1.
 2012-04-19 15:59:46 +05:30