Commit graph

216 commits

Author SHA1 Message Date
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
ram@mysql.r18.ru
d90720704b Added AsBinary alias for AsWKB function. 2003-05-21 12:26:06 +05: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
vva@eagle.mysql.r18.ru
11666b5281 small compress/uncompress modification after monty's review 2003-04-22 18:41:47 -04:00
monty@mashka.mysql.fi
6cf83136af Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-04-16 09:26:24 +03:00
monty@mashka.mysql.fi
491589baf8 Add mysys specific error messages
Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.
2003-04-16 09:25:43 +03:00
vva@eagle.mysql.r18.ru
02ad1b95e3 Merge 2003-04-10 10:25:21 -04:00
vva@eagle.mysql.r18.ru
950fa7aa8a added compress/uncompress function 2003-04-09 20:50:30 -04:00
ram@mysql.r18.ru
2180fa858b AsWKB() function has been added. 2003-04-03 15:13:14 +05:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
ram@mysql.r18.ru
9295366a5e GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
functions have been added (as synonyms for GEOMFROMWKB()).
2003-04-02 15:38:06 +05:00
bar@bar.mysql.r18.ru
76bc088b6e lex.h:
Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.
2003-03-31 19:53:50 +05:00
bar@bar.mysql.r18.ru
f9f99378c4 lex.h:
GeometryCollectionFromText is now alias for GeomCollFromText
2003-03-27 13:46:56 +04:00
hf@genie.(none)
43d3472642 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1.lck
2003-03-21 11:06:15 +04:00
monty@narttu.mysql.fi
9f200ede0d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-03-20 02:06:08 +02:00
monty@narttu.mysql.fi
b883a9c01c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
monty@narttu.mysql.fi
386411b5ba Allow optimzation of multi-table-update also for InnoDB tables
MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times
2003-03-19 00:45:44 +02:00
ram@mysql.r18.ru
031ac2a7b2 SRID support.
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
2003-03-18 15:30: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
hf@genie.(none)
410782fd5f SCRUM
IS_USED_LOCK('lock') implementation
2003-03-14 13:10:33 +04:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00
ram@mysql.r18.ru
8ecf3a0b21 Added GeometryFromText, MultiPointFromText aliases.
Added GeometryCollection type.
2003-02-28 21:17:08 +04:00
bar@bar.mysql.r18.ru
3046c3ca34 Many files:
Coercibility, initial stage
item_func.h:
  Coercibility, initial stage
2003-02-28 19:22:20 +04:00
monty@narttu.mysql.fi
a67c7ebcf7 Merge work:/my/mysql-4.1 into narttu.mysql.fi:/my/mysql-4.1 2003-02-27 04:07:29 +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
bar@bar.mysql.r18.ru
d698b5bf19 sql_yacc.yy, lex.h:
SET NAMES is now working
2003-02-26 17:02:36 +04:00
venu@myvenu.com
ee2b888696 Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM 2003-02-20 14:14:37 -08: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
monty@mashka.mysql.fi
3695c64111 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-02-12 23:18:00 +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
bar@bar.mysql.r18.ru
58d3ad72a8 lex.h:
Typo fix
2003-02-11 16:37:37 +04:00
bar@bar.mysql.r18.ru
9dbf3af990 lex.h:
New synonyms for spatial functions for
  compatibility with http://www.opengis.org/testing/sfsql/sqltsch.sql
2003-02-11 16:03:00 +04:00
bar@bar.mysql.r18.ru
9ce50e8d04 For more OpenGIS compatibility, these symbols are now synomims to GEOMETRY type:
POINT, LINESTRING, POLYGON, MULTIPOINT, MULTIPOLYGON, MULTILINESTRING
2003-02-11 15:39:14 +04:00
monty@mashka.mysql.fi
60556efaca Update lengths for fields in MYSQL_FIELD 2003-02-08 01:00:35 +02:00
monty@mashka.mysql.fi
1b9b042654 Fix problem in MIN/MAX optimisation (from last patch)
Don't make OLD_PASSWORD() a reserved word
2003-02-07 17:57:07 +02:00
monty@mashka.mysql.fi
b14b246d38 Merge with 4.0 to get fix for MIN/MAX 2003-02-07 16:38:37 +02:00
monty@mashka.mysql.fi
cf9668fd37 Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)
2003-02-06 16:55:59 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
fa7a94ed14 Added timeout for wait_for_master_pos
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
2003-01-25 15:07:51 +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
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
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
bar@bar.mysql.r18.ru
9c94dea185 SAPDB-style syntax
CREATE TABLE tname (a CHAR(10) ASCII)
  as a synonym for
CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)
2002-12-19 09:38:26 +04:00
bar@bar.mysql.r18.ru
f7711e851b Introducing SAPDB-style
"fieldname CHAR(n) UNICODE"
as a synonym to
   "fieldname CHAR(n) CHARACTER SET ucs2"
2002-12-19 09:38:25 +04:00
vva@eagle.mysql.r18.ru
8eddd4d411 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/VARIANCE/4.1.clone
2002-12-14 03:38:38 +04:00
vva@eagle.mysql.r18.ru
b624df724b add VARIANCE function 2002-12-14 03:36:59 +04:00
vva@eagle.mysql.r18.ru
7050b5eb4d add 'SOUNDS LIKE' syntax 2002-12-14 02:18:14 +04:00
monty@mashka.mysql.fi
e7164aba7e Add CHARSET keyword (missing from last push) 2002-12-11 21:22:57 +02:00
serg@serg.mysql.com
09ed694094 current_user() to return priv_user 2002-12-05 21:38:27 +01:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
serg@serg.mysql.com
f60e47fdfb INSERT ... UPDATE syntax (syntax only)
sql_yacc.yy and sql_parse.cc cleanup
2002-11-28 17:25:41 +01:00
bell@sanja.is.com.ua
32df7cacac merging 2002-11-27 11:32:09 +02:00
monty@mashka.mysql.fi
5dbea1b7a2 Merge with 4.0 2002-11-25 12:19:28 +02:00
peter@mysql.com
925155cf5a Merge.... 2002-11-24 17:26:26 +03:00
monty@mashka.mysql.fi
dfb60ca085 Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
Added CEIL as an alias for CEILING
Cleaned up CHECK constraint handling.
(We don't anymore require braces after CHECK)
Added casting to CHAR.
2002-11-24 15:47:19 +02:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
305d16a7cb Automatic conversion from CHAR(length) to BLOB when length > 255
New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0
2002-11-21 02:07:14 +02:00
monty@mashka.mysql.fi
f86d328927 Added some compatibility modes (for the future) 2002-11-20 21:44:32 +02:00
monty@mashka.mysql.fi
1a96948e81 Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
bell@sanja.is.com.ua
c78ae20589 ALL/ANY/SOME
decreasing number of rules in sql_yacc.yy to satisfy bison limitation
fixed subselect Items initializer methods
2002-11-07 23:45:19 +02:00
peter@mysql.com
bdca1d10a0 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-29 10:36:43 +03:00
vva@genie.(none)
9adf688be6 add help command on server side 2002-10-28 17:44:19 +04:00
peter@mysql.com
d21402052c One more commit to do the merge of new 4.1 tree 2002-10-06 13:42:16 +04: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
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
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
bar@bar.mysql.r18.ru
faaddbd214 Stupid bug fixes in sql_yacc.cc
New class Item_func_set_collation()
Fixed that "SELECT CONVERT(expr USING charset) GROUP BY 1" was not working
New COLLATION syntax:  <expr> COLLATE latin1
2002-08-22 18:12:45 +05:00
ram@ram.(none)
b7403f3d84 new QUOTE() fuction has been added 2002-08-08 20:25:53 +05:00
monty@hundin.mysql.fi
77296b3f67 Fix after merge
Updated WEEK() and DATE information in the manual.
2002-08-08 16:41:04 +03:00
monty@hundin.mysql.fi
087261482a merge with 3.23.52 2002-08-08 15:24:47 +03:00
monty@mashka.mysql.fi
1bb7665a9c merge 2002-08-08 03:29:36 +03:00
bar@bar.udmsearch.izhnet.ru
28062413a8 New CRC32() SQL function 2002-08-06 19:29:33 +05:00
monty@mashka.mysql.fi
d686ef729f Merge of ha_innobase.cc from 4.0; This fixes that MySQL doesn't allocate too big buffers when sorting innobase rows
Changed name of variables
NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
to avoid confusion with 'not...' variables.
Write name of adminstrator command to slow log.
Added mysqldumpslow to RPM
2002-07-29 09:35:25 +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
peter@mysql.com
c070c8e62d Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-07-25 09:38:06 +04: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
peter@mysql.com
8ee17f913c One more resolving because of pending log functions changes. Not sure if the manual is merged correctly again. Will ask arjen to check as soon as LOG changes will be pushed 2002-07-20 21:33:09 +04:00
Sinisa@sinisa.nasamreza.org
2e8fb546dc OLAP functionality plus some small bug fixes 2002-07-20 14:51:52 +03:00
peter@mysql.com
684bf18e4d Arjens LOG functions changes with small changes and tests added to mysql-test 2002-07-17 12:11:48 +04: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
monty@hundin.mysql.fi
f87efa928b Update for running gcc 3.x (mainly on HPUX)
Portability fixes for HPUX
Rename of CHECK_LOCK to IS_FREE_LOCK
Apply lower_case_table_names also to databases
Cleanup of describe code
Don't allow \ in database names
2002-06-30 18:57:21 +03:00
Sinisa@sinisa.nasamreza.org
816dc4eb28 Added functions :
* binary XOR
* logical XOR
* CHECK_LOCK("lock_name")
2002-06-29 16:25:09 +03:00
heikki@hundin.mysql.fi
3dd3463f92 sql_yacc.yy, mysql_priv.h, lex.h:
Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1
2002-06-22 20:23:53 +03:00
bar@gw.udmsearch.izhnet.ru
6f5f47855a Default table character set has been added:
CREATE TABLE a (field,...) TYPE=type CHARSET=cset;
2002-06-19 21:21:30 +05:00
peter@linux.local
f85a002c68 Merge 2002-06-14 15:24:22 +04: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
peter@linux.local
89b161d05d This changeset is mostly new version of previous commit modified according
to Monty's code style and optimization comments
2002-06-11 13:37:48 +04: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
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
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
sasha@mysql.sashanet.com
ab1fdbdeac Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-03-26 22:23:51 -07: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