Commit graph

58 commits

Author SHA1 Message Date
bell@laptop.sanja.is.com.ua
e1b53fdd42 Merge 2003-10-06 20:55:06 +03:00
bell@sanja.is.com.ua
ea187cfd42 fixed proccesing global LIMIT in last SELECT of UNION 2003-09-14 22:12:55 +03:00
Sinisa@sinisa.nasamreza.org
a26847c275 Fixes for OPTION_FOUND_ROWS in UNION's 2003-09-13 19:56:58 +03:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes.
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
Sinisa@sinisa.nasamreza.org
4ba1506244 union.result:
same as above
sql_lex.h:
  same as above 
sql_union.cc:
  same as aobve
sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result
2003-08-23 21:21:02 +03:00
bell@laptop.sanja.is.com.ua
5553868638 fixed bug of lack of fix_fields call (after merge bugfix (SCRUM))
fixed bug in Item_sum
fixed bug in dependence remover
after merge fix
2003-08-23 13:29:38 +03:00
monty@narttu.mysql.fi
359846f052 Fixed some varnings from valgrind
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
2003-08-20 16:25:44 +03:00
monty@mashka.mysql.fi
4f7512160b After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
Sinisa@sinisa.nasamreza.org
3c99eb433c sql_union.cc, sql_select.cc:
Code clean-up
sql_union.cc, union.test, union.result:
  A fix for a bug #978.
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql_select.cc:
  A commit for my second July SPRINT task
2003-08-06 18:48:34 +03:00
Sinisa@sinisa.nasamreza.org
1df6492c7d Fix for a problem with :
CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;
2003-07-02 14:57:40 +03:00
Sinisa@sinisa.nasamreza.org
fb39821e94 Some fixes for CREATE / INSERT FROM UNIO >.. 2003-07-02 01:24:05 +03:00
Sinisa@sinisa.nasamreza.org
c1660e1a23 Lot's of clean-ups and fixes for 4.0.14. 2003-07-02 00:10:47 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
monty@mashka.mysql.fi
6aa8929cf3 After merge fixes
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
13530887cb Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)
2003-05-13 18:58:26 +03:00
Sinisa@sinisa.nasamreza.org
b998c3fab9 Fix for a bug with empty item list in UNION's 2003-04-08 15:55:28 +03:00
bell@sanja.is.com.ua
50d3fc7d43 fixed uncachable union (bug #150) 2003-03-14 14:16:09 +02:00
Sinisa@sinisa.nasamreza.org
d6923a6c10 Adding tests for the fixed ORDER BY 0 bug 2003-03-10 17:07:39 +02:00
Sinisa@sinisa.nasamreza.org
4d4ac0ede3 An interim code cleanup.
Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.
2003-03-07 21:47:04 +02:00
Sinisa@sinisa.nasamreza.org
57ed8b11fd merge fixes 2003-03-06 17:31:22 +02:00
Sinisa@sinisa.nasamreza.org
ffa8a47b6d three bug fixes and major code cleanup 2003-03-06 17:02:10 +02:00
monty@narttu.mysql.fi
3b073a08e0 Portability fixes
Don't define crc32 if we are not linking with gzip
2003-02-27 03:44:44 +02:00
Sinisa@sinisa.nasamreza.org
bf3dabcce4 Allowing NULL values in UNION's with first SELECT having only NOT NULL
columns.
2003-02-22 17:02:36 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
serg@serg.mysql.com
78f492b112 do not force CONNECTION_ID(), FOUND_ROWS(), PI(), CURRENT_USER(),
and VERSION() to be uppercase in e.g. "select pi()"
2003-01-28 00:55:41 +01:00
bell@sanja.is.com.ua
9e9ea3504f after merging fixing 2003-01-14 18:00:34 +02:00
monty@mashka.mysql.fi
1f6ecc0cd3 Changed mysql-test to print warnings for not existing table to DROP TABLE
Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print()
2003-01-06 01:48:59 +02:00
monty@mashka.mysql.fi
d783e18436 merge 2002-12-14 17:49:01 +02:00
monty@mashka.mysql.fi
d49167bae5 Fixes for binary protocol (complement to last push)
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
2002-12-14 17:43:01 +02:00
Sinisa@sinisa.nasamreza.org
d8b4d6bd26 fix for a bug with UNION in sub-select's and start working on
UNION's in derived tables
2002-12-09 20:47:47 +02:00
Sinisa@sinisa.nasamreza.org
5483796c50 Proper handling of ORDER BY table.column in UNION's 2002-12-02 20:18:51 +02:00
Sinisa@sinisa.nasamreza.org
1b625220ba A bug fix for ORDER BY on table.column in provisional entire UNION
ORDER clause, where table is one of union'ed tables.
2002-11-30 22:53:50 +02:00
Sinisa@sinisa.nasamreza.org
8c3cf6adae added a test case.
And I am not able to find a Changelog for 4.1
2002-10-17 16:20:14 +03:00
bell@sanja.is.com.ua
199f667c19 merging 2002-10-04 14:15:59 +03:00
bell@sanja.is.com.ua
2883c3a8cc fixing EXPLAIN select types 2002-10-03 18:47:04 +03:00
bell@sanja.is.com.ua
46a22a5be7 new EXPLAIN
fixed bug in mysql-test/create-test-result
fixed bug in union-subselect engine
2002-09-26 23:08:22 +03:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
monty@mashka.mysql.fi
c702a1f8fd 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.
2002-07-24 19:55:08 +03:00
monty@mashka.mysql.fi
dddc20d9d1 New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
2002-07-23 18:31:22 +03:00
bell@sanja.is.com.ua
ead6f225a4 new SELECT_LEX structures used for storing global ORDER BY, global LIMIT & limit counters 2002-05-08 23:14:40 +03:00
Sinisa@sinisa.nasamreza.org
34998c5ad4 fix for SQL_CALC_FOUND_ROWS in UNION's 2002-04-03 17:52:31 +03:00
Sinisa@sinisa.nasamreza.org
b98a84a19f Fix for a bug with EXPLAIN and (....) UNION (....) order by 2002-04-02 20:08:55 +03:00
Sinisa@sinisa.nasamreza.org
8766627d73 Fixes for offset bug in UNION's and making UNION's obey
SELECT_DEFAULT_LIMIT
2002-03-22 13:26:13 +02:00
Sinisa@sinisa.nasamreza.org
87eea66796 fix for the limit bug in UNION's and some additional syntax
checkings
2002-03-19 14:07:52 +02:00
Sinisa@sinisa.nasamreza.org
90629e2ccd many fixes 2002-02-28 21:58:32 +02:00
monty@hundin.mysql.fi
87fd219d67 Fixed sleep time in mysql-test-run
Fixed bug in query cache.
Cleaned up des_crypt code.
2001-12-13 02:31:19 +02:00
Sinisa@sinisa.nasamreza.org
006ff09c34 New alternate UNION syntax and bug fix for multi-table deletes 2001-10-25 14:41:49 +03:00