mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24364 commits 2784 branches 343 tags 1.6 GiB
Commit graph

443 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
4cb99ed5bb Bug fix: 
http://bugs.mysql.com/bug.php?id=1129
From:	Georg Richter
Description: there is a problem with special chars like umlauts in comments
 2003-09-16 12:14:40 +05:00
bell@sanja.is.com.ua
a0bf98b7a4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1
 2003-09-09 17:38:21 +03:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
bell@sanja.is.com.ua
51374e569d fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation) 2003-09-02 19:56:55 +03:00
dlenev@mysql.com
73ab4be246 Manual merge fixes 2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2 Implemented replication over SSL 
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file
 2003-09-01 15:16:20 +04:00
Sinisa@sinisa.nasamreza.org
566ebb63ce merge fixes 2003-08-27 14:36:38 +03:00
igor@rurik.mysql.com
2090d57929 key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc: 
After merge fix
 2003-08-26 15:14:13 -07:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
igor@rurik.mysql.com
40193a7fa5 Manual merge 2003-08-26 00:13:22 -07: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
serg@serg.mylan
08d7f298ee fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib 
moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated
 2003-08-21 16:15:06 +02:00
bell@laptop.sanja.is.com.ua
dd9cbce47b merge 2003-08-19 20:14:35 +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
bell@laptop.sanja.is.com.ua
85f397781b Code cleanup 2003-08-16 13:26:48 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
serg@serg.mylan
835e00661d Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-08-09 23:48:57 +02:00
serg@serg.mylan
79922d946a table checksum background: 
my_checksum() mysys function
   NISAM checksum code moved from mysys to isam/ - it's obsolete
   MyISAM checksum code moved to mysys
   table's checksum accessible from sql layer
   SHOW TABLE STATUS shows checksum (WL#646)
code cleanup
 2003-08-05 21:14:15 +02:00
bell@sanja.is.com.ua
1119ec0e6f Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
 2003-08-05 09:58:00 +03:00
bell@sanja.is.com.ua
659650b4ea merge 2003-08-05 09:56:21 +03:00
igor@rurik.mysql.com
f7adcbff7b Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-08-02 03:27:13 -07:00
bell@sanja.is.com.ua
8d0647c6ac merge 2003-08-01 18:24:27 +03:00
bell@sanja.is.com.ua
6dea500fb2 prevented finding references in item_list for non-SELECT st_select_lex 
(fixed BUG#943)
 2003-07-29 16:59:46 +03:00
bell@sanja.is.com.ua
bc1546ce31 count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922) 
removerd unused loop_id
 2003-07-29 13:00:32 +03:00
igor@rurik.mysql.com
26ecd86539 Conflict resolution 2003-07-16 13:35:34 -07:00
igor@rurik.mysql.com
42e1296e9d mi_keycache.c: 
new file
Many files:
  Added CACHE INDEX command
 2003-07-16 12:30:49 -07:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
bell@sanja.is.com.ua
6348e63f62 Optimisation if simple IN subselect with primary index 
(SCRUM) (part of WL#818)
 2003-07-07 18:40:19 +03:00
pem@mysql.com
c908b555ff Fixed the old kludge for pre-loading functions and made it more efficient 
using a hash table instead (and made it work with lex pointers).
Some additional code cleanup too.
 2003-07-07 14:55:10 +02:00
bell@sanja.is.com.ua
73fdf52fa2 merged 2003-07-03 11:59:57 +03:00
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables 
Tests cleanup (put drop database first in tests)
 2003-07-03 11:55:36 +03:00
bell@sanja.is.com.ua
28207ede02 (SCRUM) 
It looks like samll revolution in SELECT_LEX tree, but it was only natural way to solve problem with name resolution of external fields inside subselect which belongs to global order of union
also it have following advantages:
 - removed mess with current_select type conversion
   - type checking/converting
   - a lot of virtual methods
 - fake select for union execution allocated only once (it was allocated for every subselect with union executing)

changes:
fixed bug with outer fields name resolution of subqueries which belong to global ORDER BY clause
remuved select_lex() function, now thd->lex.current_select always have type SELECT_LEX
new SELECT_LEX (fake_select_lex) will be allocated in case of UNION for using in UNION processing
fake_select_lex allocated for union hold global ORDER BY & LIMIT clauses and have linkage equal to GLOBAL_OPTIONS_TYPE 
new description of SELECT_LEX tree

(SCRUM)
 2003-07-03 02:30:52 +03:00
bell@sanja.is.com.ua
5eaaf8e732 after review changes (SCRUM) 
removed outer resolving flag (because of movingtransformation after fix_fields)
 2003-07-02 01:45:22 +03:00
bell@sanja.is.com.ua
f1353c1dda merged 2003-07-01 10:03:20 +03:00
bell@sanja.is.com.ua
100a101ab6 Merge 2003-06-30 13:14:18 +03:00
pem@mysql.com
9f14ae7516 sp_head now has its own mem_root (WL#961). 
Also fixed some difficult memory leaks that became apparent
in this task.
 2003-06-29 18:15:17 +02:00
bell@sanja.is.com.ua
7c799b17b6 merged 2003-06-29 15:35:48 +03:00
bell@sanja.is.com.ua
00f952849d merging 2003-06-27 23:14:20 +03:00
bell@sanja.is.com.ua
e8b1e21615 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-cond_count-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-top2-4.1
 2003-06-26 11:31:13 +03:00
bell@sanja.is.com.ua
2d120d32fa cond_count moved to SELECT_LEX_NODE 
fixed BUG #726
 2003-06-26 11:09:11 +03:00
bell@sanja.is.com.ua
7b77c5a2d3 merged 2003-06-25 23:52:15 +03:00
bell@sanja.is.com.ua
76315814b7 Fixed error handling to be able do not interrupt update (907) (SCRUM) 
fixed bug of current select pointer in subselect execution
fixed layuot
 2003-06-25 01:19:09 +03:00
bell@sanja.is.com.ua
e17ad368af Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc-4.1
 2003-06-20 13:40:21 +03:00
bell@sanja.is.com.ua
096ae170ae Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-item-4.1
 2003-06-19 15:25:41 +03:00
heikki@hundin.mysql.fi
4da7f485b7 Many files: 
Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed
 2003-06-15 01:04:28 +03:00
igor@rurik.mysql.com
a0f3dcc3c8 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f547f2769f Many files: 
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.
 2003-06-12 04:29:02 -07:00
gluh@gluh.mysql.r18.ru
7d020eae17 REVOKE all privileges and delete user(244) 2003-06-06 17:43:23 +05:00
heikki@hundin.mysql.fi
255a40c2f0 sql_yacc.yy, sql_parse.cc, sql_lex.h, mysqld.cc, lex.h: 
Add syntax SAVEPOINT id and ROLLBACK TO SAVEPOINT id. This is compatible with DB2 and Oracle but not with SQL Server. Savepoints do not do anything yet, this is just parsing.
 2003-06-06 04:18:58 +03:00
pem@mysql.com
4523a7b179 Adopt SP stuff to the new lex pointer. 2003-05-23 15:32:31 +02:00
bell@sanja.is.com.ua
6360bea28d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
 2003-05-22 09:52:22 +03:00
bell@sanja.is.com.ua
32262a0fd5 fixed subqueries name resolution with INSERT/REPLACE (found during bug 446 investigation) 2003-05-21 23:35:51 +03:00
bell@sanja.is.com.ua
3a30eda921 fixed memory overrun (bug 380) 2003-05-17 10:05:07 +03:00
guilhem@mysql.com
4a0e006230 Scrum task 845. Thi is a behaviour change : 
now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the
binlog, unless the new NO_WRITE_TO_BINLOG keyword was used :
OPTIMIZE NO_WRITE_TO_BINLOG table t;

Previously these commands were never written to the binlog, but there are
2 reasons to change this :
- the RENAME TABLE in MERGE table bug (#175) on slave
- the possible "differently optimised queries may lead to different
updates on the master and slave" bug, until we have automatic ORDER BY.

FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog.
New test for the new logging behaviour.
Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves,
this is more usual.
 2003-05-15 18:35:39 +02:00
bell@sanja.is.com.ua
1915632163 subselect transformation moved in after-fix_field place 
removed "of is null" if it is possible
  (this cset should be SCRUM related, but not approved as scrum task yet)
 2003-05-14 21:51:33 +03:00
vva@eagle.mysql.r18.ru
afd581edd3 made lex a pointer in THD 2003-05-05 14:54:37 -04:00
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02:00
Sinisa@sinisa.nasamreza.org
5dc8dbea5f merge fix 2003-04-26 15:26:28 +03:00
Sinisa@sinisa.nasamreza.org
3ca1a152eb Making a better fix for double released pointers and safe 
TMP_TABLE_PARAM.
This involved moving things around in include files.
All tests, including the ones with Valgrind passed.
 2003-04-26 15:12:14 +03:00
bell@sanja.is.com.ua
c4637293fd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1
 2003-04-23 11:20:19 +03:00
Sinisa@sinisa.nasamreza.org
adb52cfc70 Fix for a bug record #307. 
Very nasty bug.
It was caused by double free()-ing memory of join->select and 
join->quick. 

I was able to pinpoint it only after using Valgrind.

Plus better fix for bug with TMP_TABLE_PARAM.

Plus new constructor for SELECT_LEX.
 2003-04-21 21:03:32 +03:00
pem@mysql.com
386b0b91b2 Merged 4.1 into 5.0. 2003-04-16 23:23:23 +02:00
bar@bar.mysql.r18.ru
e165845d39 sys_var_collation is now abstract class 
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
 2003-04-07 16:10:27 +05:00
pem@mysql.com
736e78251e Merging 4.1 to 5.0. 2003-04-04 13:45:35 +02:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
bar@bar.mysql.r18.ru
0989db3e90 More OpenGIS compatibility: 
Point, MultiLine, Poligom, etc, are now not aliases
for Geometry, but separate field types.
 2003-03-27 13:09:09 +04:00
bar@bar.mysql.r18.ru
3a453df6c2 Two separate commands: SHOW COLLATION and SHOW CHARACTER SET 2003-03-25 13:38:05 +04:00
pem@mysql.com
4a171efd6f Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
bar@bar.mysql.r18.ru
8103c4c537 CONVERT class was removed 2003-03-18 17:01:32 +04:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
bar@bar.mysql.r18.ru
26e6fb0e24 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-03-14 18:11:20 +04:00
bar@bar.mysql.r18.ru
b009386fa4 Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00
bell@sanja.is.com.ua
50d3fc7d43 fixed uncachable union (bug #150) 2003-03-14 14:16:09 +02:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00
bell@sanja.is.com.ua
c96e588490 processing of subselect in global ORDER BY (fifed crash of server) 
this implementation have limitation: prohibited subselect in ORDER BY dependence of most outer query (will be solved after removing passing first select_lex as fake select for global mysql_select())
 2003-03-11 01:06:28 +02:00
Sinisa@sinisa.nasamreza.org
ffa8a47b6d three bug fixes and major code cleanup 2003-03-06 17:02:10 +02:00
bell@sanja.is.com.ua
d01b3b5ab5 calloc replaced with alloc in st_select_lex_node 'new' operator (SCRUM?) 2003-03-05 23:32:59 +02:00
pem@mysql.com
12f771d9e7 Improved error handling regarding SPs (with info like names etc in the output). 
Disabled queries in FUNCTIONs.
 2003-03-05 19:45:17 +01:00
pem@mysql.com
8049daf202 Made FUNCTIONs work in insert and select queries, as well as nested function invocations. 
Had to add a cahing mechanism which is in parts an ugly kludge, but it will be
reworked once the real SP caching is implemented.
 2003-03-02 19:17:41 +01:00
pem@mysql.com
d8c75ec8aa Most of the groundwork for sprint task 729 (implement FUNCTIONs). 
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
 2003-02-21 17:37:05 +01:00
pem@mysql.com
97dc6a528e Merging 4.1 into 5.0 2003-02-18 15:05:35 +01:00
gluh@gluh.mysql.r18.ru
2022b7b68f SCRUM: 'Replication: PURGE LOGS with date' task 
Added:

PURGE [MASTER] LOGS BEFORE date/date_expression
expire-logs-days option
  With this option old files are deleted when
      - mysqld is started
      - log is rotated
      - someone does FLUSH LOGS
 2003-02-16 20:39:12 +04:00
Sinisa@sinisa.nasamreza.org
f2a8927db7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-02-15 16:06:58 +02:00
Sinisa@sinisa.nasamreza.org
410cbef6b3 Code clean-up 2003-02-15 16:05:58 +02:00
monty@mashka.mysql.fi
acf8993439 Fixed problem when connecting to user without a password. 
Fixed problem with LIKE and BINARY
 2003-02-14 11:47:41 +02:00
Sinisa@sinisa.nasamreza.org
5acf83802d fix a bug in derived tables 
UNION's bug fixes and code clean-up
 2003-02-13 17:56:01 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind 
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
 2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
48558055ed Move tmp_table_used to THD 
Optimize depending sub querys
Remove valgrind warnings
 2003-02-10 17:59:16 +02:00
bell@sanja.is.com.ua
62902a3b4b after-review changes (577 SCRUM) 2003-02-02 23:30:01 +02:00
bell@sanja.is.com.ua
e294751c41 fixed bug in determinating uncacheable queries 
new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row
 2003-01-30 22:15:44 +02:00
bell@sanja.is.com.ua
214036a7f6 improving of fields list creation in derived tables and unions 
fixed length of fields created in fubselect
fixed resolving fields of reduced in derived table subselect
 2003-01-29 19:42:39 +02:00
bell@sanja.is.com.ua
0c5b323d0f fixed bugs in temporary tables in subselect implementation (SCRUM) 
merging with switching on static tables optimization (SCRUM)
fixed subselects with uncacheable results
added test for fixed bugs from bugreports
 2003-01-28 14:48:12 +02:00
bell@sanja.is.com.ua
760e22f0bb after merge fix of 577 task (SCRUM, pre commit to be able to merge with static tables optimization fix) 
fixed derived tables with subselect inside
 2003-01-26 21:30:35 +02:00
bell@sanja.is.com.ua
44d8a8cdab merging 2003-01-25 13:19:46 +02:00
bell@sanja.is.com.ua
d56e23f64e fixed subselects with temporary tables (SCRUM) 
fixed memory leacks
 2003-01-25 02:25:52 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows) 
Some changes to the prepared statement protocol to make it easier to use and faster.
 2003-01-21 21:07:59 +02:00
venu@myvenu.com
a39da98d0d Initial multi query execution support 2003-01-18 11:53:38 -08:00
monty@mashka.mysql.fi
762cb225c9 Changed my_strntoxxx functions to clear error number on start 
Allow one to change ANSI_QUOTES mode per thread and on the fly
 2003-01-17 16:33:54 +02:00
bell@sanja.is.com.ua
9e9ea3504f after merging fixing 2003-01-14 18:00:34 +02:00
monty@mashka.mysql.fi
bf683af4ce Post merge fix 
Allow empty key list in USE|IGNORE|FORCE INDEX()
 2003-01-09 22:42:31 +02:00
pem@mysql.com
1604bea5b7 Merge 2003-01-09 17:56:57 +01:00
monty@mashka.mysql.fi
f8e660d88c merge with 4.0.9 
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
 2003-01-09 03:55:26 +02:00
monty@mashka.mysql.fi
3c08da957e Don't count NULL values in cardinalty for MyISAM tables. 
Free row buffer cache after each query for MyISAM tables.
Added table join option FORCE INDEX
Fixed core dump bug when connecting with hostname that could not be resolved.
 2003-01-09 02:19:14 +02:00
vva@eagle.mysql.r18.ru
6ab60981e8 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1 
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1
 2002-12-30 01:59:08 +04:00
vva@eagle.mysql.r18.ru
1dcca480e8 processing thread specific queries 2002-12-30 01:46:48 +04:00
bar@bar.mysql.r18.ru
9b56f86f94 thd_charset copy in lex 2002-12-24 14:06:52 +04:00
bell@sanja.is.com.ua
79a184fe09 moved links initialization 2002-12-15 22:01:09 +02:00
pem@mysql.com
aae07a4d45 Simplistic, experimental framework for Stored Procedures (SPs). 
Implements creation and dropping of PROCEDUREs, IN, OUT, and INOUT parameters,
single-statement procedures, rudimentary multi-statement (begin-end) prodedures
(when the client can handle it), and local variables.
Missing most of the embedded SQL language, all attributes, FUNCTIONs, error handling,
reparses procedures at each call (no caching), etc, etc.
Certainly buggy too, but procedures can actually be created and called....
 2002-12-08 19:59:22 +01:00
monty@mashka.mysql.fi
35ff08c2af After merge fixes 
Added THD to add_to_xxx_list() functions for faster parsing.
 2002-12-06 21:11:27 +02:00
serg@serg.mysql.com
c28e99c65a added missing Com_xxx status variables 
moved SQLCOM_END to the end of the list
bad copy-paste in sql_yacc.yy fixed
 2002-11-29 14:20:25 +01:00
serg@serg.mysql.com
fcec08584a s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI 2002-11-29 12:29:27 +01:00
bell@sanja.is.com.ua
b8b7d0b03b fixed * without tables in IN bug 
fixed sunction-test select in IN bug
fixed unions in subselect bug
 2002-11-28 19:29:26 +02:00
bell@sanja.is.com.ua
1784d97f7a merging 2002-11-27 17:10:21 +02:00
bell@sanja.is.com.ua
32df7cacac merging 2002-11-27 11:32:09 +02:00
bell@sanja.is.com.ua
aa8af5d6f4 reverse order in global select list allow to avoid recursion in derived tables 2002-11-27 01:12:16 +02:00
monty@mashka.mysql.fi
3d1af24f0f Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-11-25 17:34:51 +02:00
pem@mysql.com
55a3bd911d Merge 2002-11-25 15:32:44 +01:00
monty@mashka.mysql.fi
96212cc300 Faster parsing of identifiers 
Compatibility syntax: SERIAL, [PRIMARY] KEY and VALUE
 2002-11-25 12:11:16 +02:00
bell@sanja.is.com.ua
1cee49dd86 Reference to field in outer subelect fixed 
Fixed context in error mesages
 2002-11-24 21:10:52 +02:00
pem@mysql.com
ae2192ed53 Moved safe_to_cache_query from thd to lex. 
This is required for prepared statements and stored procedures.
 2002-11-22 14:50:53 +01:00
monty@mashka.mysql.fi
806294c573 Fixes after merge with 4.0 2002-11-21 22:25:53 +02:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
bell@sanja.is.com.ua
d8f1d74fe5 fixed bug of derived table in subselect 
fixed bug in error handling
 2002-11-13 11:59:03 +02:00
monty@hundin.mysql.fi
65badfff1a Put temporary files in binlog cache when using BEGIN/COMMIT 
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
 2002-11-07 04:02:37 +02:00
bell@sanja.is.com.ua
1575f62374 IN subselect erged with current 4.1 (pointer conversion) 2002-11-05 11:21:40 +02:00
bell@sanja.is.com.ua
e0f14c2716 move similar code to inline function 2002-11-05 01:10:05 +02:00
bell@sanja.is.com.ua
45f098bf60 moved similar code to function 
onversion with check
 2002-11-04 22:12:45 +02:00
bell@sanja.is.com.ua
bb49de5ff5 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1
 2002-11-04 15:45:54 +02:00
bell@sanja.is.com.ua
3e8a5e1d34 IN subselect with ORDER BY, HAVING & sum functions 2002-10-31 02:11:59 +02:00
bell@sanja.is.com.ua
1f20cf3b42 removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM) 
fixed some possible bugs
 2002-10-30 13:18:52 +02:00
vva@genie.(none)
2196aae6b4 correct English in last message 
delete ugly comma
 2002-10-29 12:52:34 +04:00
vva@genie.(none)
9adf688be6 add help command on server side 2002-10-28 17:44:19 +04:00
bell@sanja.is.com.ua
7777d2b819 fixed union rexecution bug 2002-10-27 21:29:40 +02:00
bell@sanja.is.com.ua
c3127c7eb8 code cleanup 
fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug
 2002-10-26 20:18:37 +03:00
Sinisa@sinisa.nasamreza.org
6561faa10e Some small accelerations ... 
I intend to do some more accelerations in mysql_execute_command and
in SQLCOM_SELECT part for which I need to fix EXPLAIN with derived
tables plus few additional items. If this proves to be much I wil
just make it a new SCRUM task
 2002-10-16 21:17:57 +03:00
Sinisa@sinisa.nasamreza.org
0f663d346f Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-10-16 16:57:42 +03:00
Sinisa@sinisa.nasamreza.org
cd5ff6301e some fixes for SELECT INTO @vars .. 2002-10-16 16:55:08 +03:00
Sinisa@sinisa.nasamreza.org
96078b5fc5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-10-14 17:50:44 +03:00
monty@narttu.mysql.fi
3c7f6a9835 merge 2002-10-14 12:07:16 +03:00
bell@sanja.is.com.ua
d9f998164d fixed bug of multi-level EXPLAIN 2002-10-13 14:25:16 +03:00
Sinisa@sinisa.nasamreza.org
97990887cb SCRUM task 2002-10-11 21:49:10 +03:00
monty@narttu.mysql.fi
da2abaf887 Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
bell@sanja.is.com.ua
199f667c19 merging 2002-10-04 14:15:59 +03:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
d69250a969 Fixes and code cleanups after merge with 4.0.3 
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
 2002-10-02 13:33:08 +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@mashka.mysql.fi
0281a6b160 Fixed searching after ssl directories. 
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
 2002-09-05 16:17:08 +03:00
bell@sanja.is.com.ua
d9989c635e merged 2002-09-03 10:06:10 +03:00
bell@sanja.is.com.ua
b07aaeb295 subselect with union 
new error handling
Item_ref bug fixed
 2002-09-03 09:50:36 +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
bc035c71f1 Merge with 3.23.51 
Fixed wrong usage of sprintf() in ha_innodb.cc
 2002-07-25 22:46:28 +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
fc7f7a2110 Small fixes after merge 2002-07-23 22:08:37 +03:00
monty@mashka.mysql.fi
4233d3a3d4 merge 2002-07-23 20:39:36 +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
Sinisa@sinisa.nasamreza.org
ff2608099d Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2002-07-16 22:45:59 +03:00
Sinisa@sinisa.nasamreza.org
c5738005c4 Just making commit in order to stop getting erors. 
Will do a push when it starts working ..
 2002-07-16 22:42:53 +03:00
heikki@hundin.mysql.fi
7390d81f43 Many files: 
Merge InnoDB-3.23.52b
 2002-07-08 19:34:49 +03:00
bell@sanja.is.com.ua
984c84c234 cleanup 2002-07-05 08:15:57 +03:00
bar@gw.udmsearch.izhnet.ru
189d1dd630 SHOW CREATE DATABASE name; 
Small fixes in database default charset code
 2002-07-02 14:31:54 +05:00
bell@sanja.is.com.ua
ba30e55d4b typo fixed 2002-07-01 19:13:14 +03:00
bell@sanja.is.com.ua
0c6cb114e2 subselect clean up 
fix after automerge
 2002-07-01 19:06:24 +03:00
bell@sanja.is.com.ua
1a88542102 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-having-4.1
 2002-07-01 14:17:59 +03:00
bell@sanja.is.com.ua
2cf620004e subselect in having clause 
fixed bug in sum function in subselect
 2002-07-01 14:14:51 +03:00
jani@rhols221.adsl.netsonic.fi
7cad1f9313 Added interface for first set of dynamic variables. 2002-06-28 19:30:09 +03:00
bar@gw.udmsearch.izhnet.ru
0dce493b69 ALTER DATABASE DEFAULT CHARACTER SET latin1; 2002-06-27 14:41:02 +05:00
venu@myvenu.com
5a33842a16 sql_error.cc, sql_prepare.cc: 
new file

  Client-server protocol 4.1 changes - Server side:

 * Enhanced metadata information:
    - SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
    - SHOW [COUNT(*)] WARNING [LIMIT [offset,] rows]
    - SHOW TABLE TYPES
    - SHOW PRIVILEGES
    - SHOW COLUMN TYPES (Not fully implemented)

 * Prepared execution
 * Long data handling in pieces
 * And other misc changes
 2002-06-12 14:13:12 -07:00
monty@mashka.mysql.fi
b8421d34ec Added the following new privleges: 
SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE

All scripts & documentation is updated for this change.
Added better error messages for global privileges
 2002-06-12 15:04:18 +03:00
bar@gw.udmsearch.izhnet.ru
e8571e68bb New command: SHOW CHARACTER SET [LIKE 'wild'] 2002-06-11 17:40:06 +05:00
monty@mashka.mysql.fi
2aecdd1a91 Big code cleanup/review before 4.0.2 release. 
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
 2002-06-11 11:20:31 +03:00
bell@sanja.is.com.ua
289ac250af merged 2002-06-05 21:32:22 +03:00
monty@hundin.mysql.fi
f0b28da6f9 merge with 4.0 2002-06-03 12:59:31 +03:00
monty@hundin.mysql.fi
6e54cc492c Extension of .frm file (not yet ready for push) 2002-06-02 21:22:20 +03:00
bell@sanja.is.com.ua
fb2cd68b5d new subselect tests 
LIMIT fixed
AVG & STD with subselect fixed
join_free fixed to be depended queries compatible
sort_default removed from SELECT_LEX
 2002-06-01 23:35:36 +03:00
bell@sanja.is.com.ua
ab36838e9b Hiding internal pointers of SELECT_LEX structures 2002-05-27 20:52:54 +03:00
bell@sanja.is.com.ua
59602212d2 merge 2002-05-26 22:57:08 +03:00
bell@sanja.is.com.ua
35faf872aa added depended subselect processing 2002-05-26 22:50:32 +03:00
bar@gw.udmsearch.izhnet.ru
2b0a5e1f65 Charset related synax changes, now these things work in parser: 
CREATE DATABASE name DEFAULT CHARACTER SET charsetname;
CREATE DATABASE name (fieldname CHAR(n) CHARACTER SET charsetname);
Changes affect query parsing ONLY and do not have other effect yet.
 2002-05-20 17:10:50 +05:00
Sinisa@sinisa.nasamreza.org
d65671f778 Features made for Schlund plus several bug fixes. 
Read a manual for more detail
 2002-05-15 13:50:38 +03:00
bell@sanja.is.com.ua
4cb3760b44 total table list managment is changed 2002-05-09 15:23:57 +03:00
bell@sanja.is.com.ua
494184ff5f new SELECT_LEX structure 2002-05-07 00:04:16 +03:00
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
Sinisa@sinisa.nasamreza.org
22d4f87e69 Derived tables ! 2002-03-26 15:06:05 +02:00
sasha@mysql.sashanet.com
2e6b48afd3 replication updates and bugfixes. Still not perfect - there is some strange 
memory corruption I can only repeat on one system.
 2002-03-15 18:44:44 -07:00
sasha@mysql.sashanet.com
d993a1c0c4 slave start <options> to be able to do 
slave start io_thread 
 slave start sql_thread
same for stop
 2002-03-09 21:48:06 -07:00
monty@hundin.mysql.fi
e070e9a01f merge with 3.23.49 2002-02-14 18:58:24 +02:00
monty@hundin.mysql.fi
b21f2d084f Don't give warnings for empty statements with comments 2002-02-14 15:04:14 +02:00
sasha@mysql.sashanet.com
684f13ef4c Ugly merge! But I am not done yet - there are a number of things I need to fix 
before I can push
 2002-01-19 22:46:25 -07:00
sasha@mysql.sashanet.com
56129ce634 Here comes a nasty patch, although I am not ready to push it yet. I will 
first pull, merge,test, and get it to work.

The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to 
prepare for multi-master implementation. 

I also documented IO_CACHE quite extensively and to some extend, THD class.
 2002-01-19 19:16:52 -07:00
Sinisa@sinisa.nasamreza.org
17d94da96d Accomodating Monty's changes from MULTI_DELETE to DELETE_MULTI 2001-12-26 17:55:24 +02:00
Sinisa@sinisa.nasamreza.org
4ed4546004 Changes for the BitKeeper resolve. 
One more notice:

limiting number of queries per hour for different users has been done
on 4.0.1 , but I can port it to 3.23.* 

This will require only certain changes, like number of columns in user
table.

I will also make a test case for it, after it is approved by Monty, 
as result file will depend on the error message text.
 2001-12-26 17:42:06 +02:00
Sinisa@sinisa.nasamreza.org
038db406c1 This is a large push. Included are : 
* multi-table updates
* new paid feature for limiting number of queries per hour for users
* optional syntax for multi-table deletes
* optimization for SQL_CALC_FOUND_ROWS
* a small addition for CREATE .. SELECT that will be of future use

I know that all this will require many additions to documentation, 
which I have not done, but I am at Arjen's disposal to help him document
all this.
 2001-12-26 16:49:10 +02:00
monty@hundin.mysql.fi
cb754eb5aa Fix after merge 2001-12-17 23:24:51 +02:00
monty@hundin.mysql.fi
c298f03570 merge with 3.23.47 (DO statement) 2001-12-17 20:47:20 +02:00
monty@hundin.mysql.fi
f049543416 Added DO command 2001-12-17 19:59:20 +02:00
monty@hundin.mysql.fi
0c0a170fa7 Fix that SHOW STATUS works with SSL. 
Add 4.0 commands to SHOW STATUS.
 2001-12-13 22:03:09 +02:00
monty@hundin.mysql.fi
6aeb40bd3f merge 2001-12-13 20:54:20 +02:00
monty@hundin.mysql.fi
bdc5a62104 Added status variables for all MySQL commands. 2001-12-13 20:06:44 +02:00
monty@hundin.mysql.fi
12058c2996 Fixed bug in GROUP BY ... DESC 2001-12-10 17:51:07 +02:00
monty@hundin.mysql.fi
b658662ae4 Update copyright 
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
 2001-12-06 14:10:51 +02:00
Sinisa@sinisa.nasamreza.org
376638b15b Unchecked changes, so that I could run mysql-test. 
If I ruined anything, write your complaints to sasha@mysql.com
 2001-10-19 17:43:30 +03:00
monty@hundin.mysql.fi
06e719b7cc Remved Gemini code. 2001-10-10 02:50:28 +03:00
monty@hundin.mysql.fi
2f603156ed Cleanup after last merge 2001-10-08 07:24:04 +03:00
monty@work.mysql.com
0c81c7ea07 Merge 2001-10-07 13:31:12 +02:00
monty@hundin.mysql.fi
88e5ee0184 Fix for 'mysqladmin -w1 unknown-command' 
Manual Changelog update
 2001-10-07 14:18:09 +03:00
tonu@volk.internalnet
a16796c8ac Merge work.mysql.com:/home/bk/mysql-4.0 
into volk.internalnet:/home/tonu/mysql-4.0
 2001-09-30 10:47:32 +08:00
tonu@volk.internalnet
5658ff8237 SSL compiles and works as far as can see. Continue testing.. 2001-09-30 10:46:20 +08:00
monty@tik.mysql.fi
e05bf277d6 Final fixes for INSERT into MERGE tables. 
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
 2001-09-27 21:45:48 +03:00
tonu@volk.internalnet
d6fb40171b SSL parser changes to allow SSL specific GRANT commands 2001-09-22 22:32:43 +08:00
monty@hundin.mysql.fi
59e7c97dab Remove warnings and portability fixes 
New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.
 2001-08-14 20:33:49 +03:00
Sinisa@sinisa.nasamreza.org
2252f945d0 Changes so that CREATE and INSERT work from UNION's 2001-08-12 16:01:32 +03:00
monty@tik.mysql.fi
b13d453d50 Fix UNION 
New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION
 2001-08-02 06:29:50 +03:00
Sinisa@sinisa.nasamreza.org
f0a6416b07 UNIONs : further work 2001-07-22 13:25:56 +03:00
monty@tik.mysql.fi
ca771c46bb merge 2001-07-08 06:24:03 +03:00
sasha@mysql.sashanet.com
c01d4e1ef7 SHOW NEW MASTER FOR SLAVE WITH ... 2001-07-04 17:14:31 -06:00
monty@tik.mysql.fi
0559758630 Added support for ANSI SQL X'hex-string' format. 
Fixed mysqldump to use -- instead of # as comment characters.
Removed support for the 3.20 protocol format
 2001-07-04 09:39:58 +03:00
monty@hundin.mysql.fi
897b37b506 Changed safe_mysqld -> mysqld_safe 
Added some alias to SHOW commands
Prepare for dynamic changing of MySQL variables
 2001-06-28 10:49:16 +03:00
sasha@mysql.sashanet.com
992f889878 added SHOW BINLOG EVENTS 
fixed log sequence bugs
fixed bugs in handling Slave event
added test case with SHOW BINLOG EVENTS
have not fixed all the bugs - found some that are also in 3.23,
will fix them there first, then do pull and cleanup

will not push this changeset
 2001-06-21 13:19:24 -06:00
Sinisa@sinisa.nasamreza.org
0d0ca68e48 Second phase of UNIONS (please do not test it yet) and some other 
changes. This is mostly a merge between my repository and central 
one, so that I can take a test for multi table delete and fix it.
 2001-06-13 13:36:53 +03:00
Sinisa@sinisa.nasamreza.org
b37a556889 bk resolve work 2001-06-07 14:25:45 +03:00
Sinisa@sinisa.nasamreza.org
338b51b5a7 These are actually two changesets. One for splitting LEX in two and 
the other for multi-table delete
 2001-06-03 17:07:26 +03:00
sasha@mysql.sashanet.com
a817bd3862 A slave now can optionally register with the master providing the 
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are
 2001-05-30 18:50:56 -06:00
sasha@mysql.sashanet.com
8f6b34f950 updates for LOAD DATA FROM MASTER + some cleanup of replication code 2001-05-28 19:18:23 -06:00
serg@serg.mysql.com
8b2a9517a6 ALTER TABLE ... DISABLE KEYS / ALTER TABLE ... ENABLE KEYS 2001-05-11 22:26:12 +02:00
serg@serg.mysql.com
a6ebe74e3c Preliminary commit of HANDLER syntax (w/o LIMIT or column-list) 2001-04-07 00:18:33 +02:00
mikef@nslinux.bedford.progress.com
d145a6b97e Add support for Gemini table handler, Monty has checked and approved 
Fix bug when read return error
 2001-03-21 15:34:16 -05:00
monty@tik.mysql.fi
6f9a73a1ba Added isolation levels 
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE
 2001-03-21 01:02:22 +02:00
tim@cane.mysql.fi
5fdf032769 Added SHOW OPEN TABLES. Thanks to Antony T Curtis <antony@abacus.co.uk> 
for the code.
 2000-12-18 23:22:20 +02:00
tim@cane.mysql.fi
7bff1dd4db Add SHOW LOGS command. 2000-12-15 13:18:52 +02:00
monty@narttu.mysql.fi
b689a1a752 merge 2000-11-16 00:24:11 +02:00
monty@tik.mysql.com
7a013339f8 Bug fixes, TRUNCATE, safer passwords on command line and connect timeout 2000-11-13 23:55:10 +02:00
sasha@mysql.sashanet.com
75cd25a579 fixed --skip-slave-thread bug 
added PURGE MASTER LOGS TO and SHOW MASTER LOGS
fixed the output of SHOW MASTER STATUS
updated docs
 2000-10-26 22:11:55 -06:00
monty@donna.mysql.com
00625e0f8f Added RESET command 2000-10-14 11:16:17 +03:00
sasha@mysql.sashanet.com
a08be4f963 fixed resolve problems 2000-09-16 20:04:06 -06:00
sasha@mysql.sashanet.com
037516b7a2 resolved conflicts 2000-09-16 18:31:30 -06:00
sasha@mysql.sashanet.com
af9e034dac Docs/manual.texi 
Updates for BACKUP TABLE/RESTORE TABLE
    Added Replication FAQ
    Cleaned up TODO list removing a duplicate and features already implemented
    Updated changelog for 3.23.25
sql/sql_lex.h
    Re-added backup_dir to Lex which dispappeared while resovling conflicts
 2000-09-16 18:23:30 -06:00
monty@donna.mysql.com
f2f515e5c2 Fix that REPAIR/ALTER TABLE use myisam_tempdir 2000-09-16 19:06:21 +03:00
sasha@mysql.sashanet.com
44bc3f9b0e merge of conflicts 2000-09-15 11:00:35 -06:00
sasha@mysql.sashanet.com
44455063e5 BACKUP TABLE TO 'directory' 
RESTORE TABLE FROM 'directory'
log on slave when it connects to the master
 2000-09-14 16:34:50 -06:00
monty@donna.mysql.com
b581f17be2 Fixes for MERGE TABLES and HEAP tables 2000-09-14 02:39:07 +03:00
monty@donna.mysql.com
aa3580924b RENAME TABLE table_name TO new_table_name ; Faster Alloc 
Small bug fixes
 2000-08-21 03:00:52 +03:00
bk@work.mysql.com
f4c589ff6c Import changeset 2000-07-31 21:29:14 +02:00