mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
70296 commits 2780 branches 343 tags 1.6 GiB
Commit graph

27 commits

Author SHA1 Message Date
Mats Kindahl
ee789c28b4 Merging into mysql-5.5.16-release. 2011-08-15 20:12:11 +02:00
Vasil Dimov
c3b8964687 Merge mysql-5.5 -> mysql-5.5-innodb 2011-03-02 11:00:48 +02:00
Vasil Dimov
7bb633e7c9 Use plugin_author also for the InnoDB SE plugin 
Move the const variable plugin_author to a common header file that is
being included by both ha_innodb.cc and i_s.cc
 2011-02-28 11:07:22 +02:00
Vasil Dimov
e4e154e92b Change InnoDB plugins author to Oracle Corporation 2011-02-28 11:02:24 +02:00
Vasil Dimov
47741182d6 Non-functional change: use plugin_author instead of hardcoded string. 
plugin_author is currently defined as "Innobase Oy" so this change is
a no-op.
 2011-02-28 10:39:48 +02:00
Georgi Kodinov
7fd0c36b7b merge 2011-01-10 15:09:57 +02:00
Jimmy Yang
e73cb16593 Merge from mysql-5.1-security to mysql-5.5-security 2011-01-07 00:00:36 -08:00
Jimmy Yang
a9c095a06d merge from mysql-5.1-innodb to mysql-5.5-innodb 2011-01-06 19:50:49 -08:00
Jimmy Yang
19a2f5cd21 Fix Bug #58643 InnoDB: too long table name 
rb://531 approved by Sunny Bains
 2010-12-05 18:42:23 -08:00
Vasil Dimov
64ef6416bf Manually merge a GCC warning fix from 5.1 to 5.5: 
------------------------------------------------------------
  revno: 3615
  revision-id: vasil.dimov@oracle.com-20100928081234-22qbm6cwht521484
  parent: vasil.dimov@oracle.com-20100928063833-snn6cjwgksa6gk3b
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  branch nick: mysql-5.1-innodb
  timestamp: Tue 2010-09-28 11:12:34 +0300
  message:
    Silence a GCC warning about reaching the end of non-void func
    
    Spotted by:	Marko
 2010-09-28 11:14:42 +03:00
Vasil Dimov
c07b437ffe (i_s.cc:1111) Bug#55227 Fix compiler warnings in innodb with gcc 4.6 2010-09-20 19:07:54 +03:00
Jimmy Yang
76ea88cdb6 Temporarily backout the Information Schema System Table Information Schema 
interface related change, will put back in once gain approval.
 2010-09-16 19:24:32 -07:00
Jimmy Yang
e168621d61 Fix Bug #55395 INNODB_TRX duplicates columns 
rb://408 approved by Sunny Bains
 2010-07-26 03:07:36 -07:00
Marko Mäkelä
d26a9ed0d3 Bug#54728: Replace the dulint struct with a 64-bit integer. 2010-06-23 14:06:59 +03:00
Jimmy Yang
987a04b417 Fix bug #54159 InnoDB: New warnings on Windows. Provide "signed/unsigned" 
parameter to virtual function store() for longlong data type.

rb://371 approved by Sunny.
 2010-06-01 22:26:31 -07:00
Jimmy Yang
a51779c7c2 Fix an assertion failure with UNIV_DEBUG is set. Initialize a 
dict_index_t structure to NULL in dict_load_index(), we could
enter SYS_INDEXES and got table id value comparision failure
for system tables such as SYS_TABLES. In addition, remove
dict_sys mutex assertion when fill I_S table, as we no longer
hold mutex accross the fill operation.

rb://367 approved by Marko.
 2010-05-27 04:15:54 -07:00
Jimmy Yang
00dfb12b92 Check in the support for Information Schema System Table Views. Users 
can now view the content of InnoDB System Tables through following
information schema tables:

information_schema.INNODB_SYS_TABLES
information_schema.INNODB_SYS_INDEXES
information_schema.INNODB_SYS_COUMNS
information_schema.INNODB_SYS_FIELDS
information_schema.INNODB_SYS_FOREIGN
information_schema.INNODB_SYS_FOREIGN_COLS
information_schema.INNODB_SYS_TABLESTATS

rb://330 Approved by Marko
 2010-05-25 18:44:33 -07:00
Jimmy Yang
bd65e80c84 Check in patch for bug #53336, Improved InnoDB Transaction Reporting. 
rb://335, Approved by Sunny Bains
 2010-05-12 08:39:45 -07:00
Vasil Dimov
5875344794 Merge mysql-trunk into mysql-trunk-innodb 2010-05-11 14:29:58 +03:00
Sunny Bains
bb646f6937 Fix whitespace. 2010-04-30 20:47:57 +10:00
Mats Kindahl
f96694f9c7 WL#5030: Splitting mysql_priv.h 
Removing traces of mysql_priv.h from comments and other
non-source files that were missed before.
 2010-04-21 00:29:30 +02:00
Vasil Dimov
d361aed9d5 Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
Vasil Dimov
ff03e2ffd0 Replay c2996 on top of the new storage/innobase 2010-04-13 18:26:27 +03:00
Vasil Dimov
5f9ba24f91 Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
Mats Kindahl
e409d6f69c WL#5030: Split and remove mysql_priv.h 
This patch:

- Moves all definitions from the mysql_priv.h file into
  header files for the component where the variable is
  defined
- Creates header files if the component lacks one
- Eliminates all include directives from mysql_priv.h
- Eliminates all circular include cycles
- Rename time.cc to sql_time.cc
- Rename mysql_priv.h to sql_priv.h
 2010-03-31 16:05:33 +02:00
Joerg Bruehe
796a257cf5 Some fixes to make 5.4.2-beta compile on the less common 
platforms like AIX, HP-UX, and Solaris 8.

All these are upmerges from 5.1 which came too late to be
included when 5.4.2-beta was cloned, so they were applied
during the build phase.
 2009-09-08 15:38:40 +02:00
Guilhem Bichot
29a46b4cf9 Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 
layout as we always had in trees containing only the builtin
2) win\configure.js WITH_INNOBASE_STORAGE_ENGINE still works.
 2009-08-07 12:16:00 +02:00
Renamed from storage/innodb_plugin/handler/i_s.cc (Browse further)