Commit graph

110 commits

Author SHA1 Message Date
pem@mysql.com
df69f93ae9 Post-merge post-merge fix (new error codes for fparser). 2004-05-14 16:10:31 +02:00
bell@sanja.is.com.ua
3c5cec08c0 file parser for new .frm 2004-05-11 23:23:49 +03:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
magnus@neptunus.(none)
88478c28b1 Merge conflicts with EXAMPLE handler 2004-04-15 09:22:29 +02:00
magnus@neptunus.(none)
7c2c408cb8 Added NDB storage engine 2004-04-15 09:14:14 +02:00
brian@brian-akers-computer.local
4d5a8cb78c All changes are to allow someone to compile the example storage engine and use it. 2004-04-12 21:01:45 -07:00
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
ram@gw.mysql.r18.ru
c4728c276a Code cleanup:
we don't need opt_range.h and opt_range.cc files at all.
2004-02-03 14:35:24 +04:00
lenz@kallisto.local
b1406b3be6 - Added missing backslash to sql/Makefile.am that prevented the sp_* header
files from being included in the source distribution
2003-12-04 12:02:18 +01:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
lenz@kallisto.local
2906f76e5b - added sql_bitmap.h to the source distribution 2003-11-12 12:32:51 +01:00
monty@narttu.mysql.fi
a444a3449f Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
2003-11-03 14:01:59 +02:00
pem@mysql.telia.com
04f0570fe8 Implemented SP CONDITIONs and HANDLERs, with the extension of handling
MySQL error codes as well.
(No UNDO HANDLERs yet, and no SIGNAL or RESIGNAL.)
WL#850
2003-09-16 14:26:08 +02:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
monty@mashka.mysql.fi
ebcc7b5a4f Support for variables with components
Added framework to create/drop and manager buffers for multiple key caches
2003-07-06 19:09:57 +03:00
pem@mysql.com
6d225437ed Code cleanup (and moved sp cache to separate file). 2003-07-03 15:58:37 +02:00
lenz@mysql.com
6f5cae4358 - added $(EXEEXT) to gen_lex_hash generation/execution to fix a build
problem on Windows/cygwin (BUG#668)
2003-06-20 15:19:51 +02:00
monty@narttu.mysql.fi
a1034db4b9 Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
2003-06-14 11:37:42 +03:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +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
hf@deer.(none)
f78e0d7ad5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
2003-06-03 15:03:29 +05:00
hf@deer.(none)
02d3d7e8bd SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
2003-05-31 15:15:46 +05:00
ram@mysql.r18.ru
a36d4212fc Moved spatial functions to the sql/item_geofunc.cc file. 2003-05-30 15:22:34 +05:00
bar@bar.mysql.r18.ru
06acc76392 convert.cc was removed 2003-05-23 14:02:27 +05:00
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02:00
hf@deer.mysql.r18.ru
ca02714715 SCRUM
Protocol_cursor class and sql-common/ directory
2003-04-23 19:37:33 +05:00
pem@mysql.com
97dc6a528e Merging 4.1 into 5.0 2003-02-18 15:05:35 +01:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
152f0603e7 Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
2003-01-28 08:51:03 +02:00
lenz@mysql.com
82aca82da0 - added a dummy file "reservedwords.texi" to the BK tree and the Makefiles,
so it's part of the distribution (manual.texi includes this file)
   It will be replaced with the correct one from the mysqldoc tree before
   building the distribution
 - removed generation and inclusion of MIRRORS file, since the mirror list
   is no longer part of manual.texi anyway
 - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
 - Redirect standard error when checking for dpkg-architecture in ltconfig
   to avoid error message showing during configuration
2003-01-27 13:44:16 +01:00
pem@mysql.com
1604bea5b7 Merge 2003-01-09 17:56:57 +01:00
lenz@mysql.com
9f381cdcfa - added missing file sql/protocol.h to distribution 2002-12-20 13:43:40 +01:00
pem@mysql.com
77b671f594 Moved create/find/drop functions to a separate files (sp.cc,sp.h).
Fixed backpatching of forward jumps.
Implemented LOOP, WHILE, REPEAT (temporarily known as SPREPEAT).

Known bug: Expression evaluation still not quite ok (e.g. "x > 0"),
which is why IF and CASE is not yet implemented.
2002-12-12 13:14:23 +01:00
monty@mashka.mysql.fi
d3eb993a27 rename of net_pkg.cc to protocol.cc
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +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
bell@sanja.is.com.ua
4be2cfd62d merging 2002-11-27 19:31:11 +02:00
serg@serg.mysql.com
b385eb4a05 removed redundant -I include-dirs 2002-11-26 14:01:08 +01:00
lenz@mysql.com
996255648b - Applied required modifications for automake 1.5
- "make distcheck" needs to be fixed
2002-11-17 16:45:21 +01:00
bell@sanja.is.com.ua
7a9f47759e basic row Items (SCRUM) 2002-11-15 20:32:09 +02:00
vva@genie.(none)
9adf688be6 add help command on server side 2002-10-28 17:44:19 +04:00
serg@serg.mysql.com
fcb8bc061d merged 2002-10-14 11:36:48 +00:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
lenz@mysql.com
3cf7acb756 - Applied required modifications for automake 1.5
- some additional small fixes
 - added "depcomp" for automake 1.5
2002-10-01 21:57:10 +02: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
lenz@mysql.com
bbbfcdca68 - Added missing files to distribution
- removoved getopt.h (has been replaced by my_getopt.h)
2002-08-06 13:59:07 +02:00
lenz@mysql.com
421a8a4927 Added sql/set_var.h to distribution 2002-07-24 13:48:27 +02:00
monty@mashka.mysql.fi
4233d3a3d4 merge 2002-07-23 20:39:36 +03:00