diff options
| author | monty@mashka.mysql.fi <> | 2002-07-24 19:55:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-07-24 19:55:08 +0300 |
| commit | c702a1f8fda0814db36801b91c601329225f8030 (patch) | |
| tree | 31ee919bea7e4456572b62d5ea7302dc58bc0b6a /sql/sql_olap.cc | |
| parent | 00089b8148dfc8b3e4cf2be94ec33fc51665f529 (diff) | |
| download | mariadb-git-c702a1f8fda0814db36801b91c601329225f8030.tar.gz | |
Removed wrong implementation of CUBE/ROLLUP
Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.
Diffstat (limited to 'sql/sql_olap.cc')
| -rw-r--r-- | sql/sql_olap.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sql/sql_olap.cc b/sql/sql_olap.cc index d05e891db63..fa4d23805f4 100644 --- a/sql/sql_olap.cc +++ b/sql/sql_olap.cc @@ -15,7 +15,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* OLAP implementation by Sinisa Milivojevic <sinisa@mysql.com> */ +/* + OLAP implementation by Sinisa Milivojevic <sinisa@mysql.com> + Inspired by code submitted by Srilakshmi <lakshmi@gdit.iiit.net> + + The ROLLUP code in this file has to be complitely rewritten as it's + not good enough to satisfy the goals of MySQL. + + In 4.1 we will replace this with a working, superior implementation + of ROLLUP. +*/ + +#ifdef DISABLED_UNTIL_REWRITTEN_IN_4_1 #ifdef __GNUC__ #pragma implementation // gcc: Class implementation @@ -179,3 +190,5 @@ int handle_olaps(LEX *lex, SELECT_LEX *select_lex) sl_return=1; // impossible return sl_return; } + +#endif /* DISABLED_UNTIL_REWRITTEN_IN_4_1 */ |