Commit graph

473 commits

Author SHA1 Message Date
acurtis@pcgem.rdg.cyberkinetica.com
0a27eef814 Cleanup ha_checktype() and redundant variables. 2004-03-02 10:08:50 +00:00
monty@mysql.com
e9315f984d Changed wellformedlen to well_formed_len
Fixed that blobs >16M can be inserted/updated
Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
2004-02-17 01:35:17 +02:00
hf@deer.(none)
e100530b3e Fix for #2212 (mysql_change_user doesn't work in embedded library)
now it's working
2004-02-14 20:26:21 +04:00
pem@mysql.com
5faf244b30 Merge mysql.com:/home/pem/work/mysql-4.1
into mysql.com:/home/pem/work/mysql-5.0-merge
2004-02-13 17:39:00 +01:00
hf@deer.(none)
32039398ef Fix for #2211 (field->def contains invalid values) 2004-02-13 17:20:56 +04:00
hf@deer.(none)
c25fc5c664 Another fix for #2208
previous one had error
2004-02-13 11:56:36 +04:00
hf@deer.(none)
5e4a5cb44c Fix for #1438 (mysql_info always returns 0) 2004-02-12 16:47:57 +04:00
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
hf@deer.(none)
348bd98e48 Fix for #2208 (multi-query returns wrong result in embedded library)
now we execute only one first select during mysql_real_query
others - during 'mysql_next_result'
2004-02-10 17:09:59 +04: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
hf@deer.(none)
7f26ab154c Fix for #2209
mysql->server_status wasn't set after the query
2004-01-27 16:51:11 +04:00
hf@deer.(none)
631dc30c5a Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.1224
2004-01-27 13:48:20 +04:00
hf@deer.(none)
94b0713ca1 bugfix to #1224
code slightly modified with Monty's suggestions
2004-01-27 13:46:47 +04:00
hf@deer.(none)
1edab55f32 code cleanup (unnecessary line in libmysqld/Makefile.am) 2004-01-27 11:25:07 +04:00
hf@deer.(none)
3348564447 Fix for 1224 (USER() CURRENT_USER() functions in embedded library)
Now we return user@host for USER() in embedded library
CURRENT_USER returns empty string if library compiled with
NO_EMBEDDED_ACCESS_CHECKS
2004-01-07 21:30:15 +04:00
hf@deer.(none)
2e7a5d3e74 SCRUM
WL#1246 (Query cache in embedded library)
Some fixes after testing
2004-01-07 16:41:09 +04:00
hf@deer.(none)
73012f0db2 Merge 2004-01-07 12:54:28 +04:00
hf@deer.(none)
9db115c027 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2046
2003-12-24 16:04:24 +04:00
pem@mysql.com
d672412102 Merge 4.1 to 5.0 (the prep stmt fixes in particular). 2003-12-20 13:10:29 +01:00
konstantin@oak.local
2a25b2617a Prepared_statement deployed instead of PREP_STMT. 2003-12-20 02:16:10 +03:00
konstantin@oak.local
d37da004f6 THD::lex now points to THD::main_lex like in 5.0
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
pem@mysql.com
7b13840a46 Merge 2003-12-18 17:51:43 +01:00
hf@deer.(none)
42799cc584 Fix for #2126 (mysql_server_init call shouldn't be needed)
now mysql_server_init is called from mysql_init with fake parameters
mysql_once_init code included to mysql_server_init.
embedded-specific initialization is in init_embedded_server function
2003-12-18 15:51:22 +04:00
monty@mysql.com
30e318311b Fixes for last pull 2003-12-16 14:40:57 +02:00
hf@deer.(none)
1485d9b438 Edited fix for #1224.
strcpy changed to strmake
2003-12-12 18:27:25 +04:00
hf@deer.(none)
5aaa6e61a6 Fix for #1224 in 4.0
we didn't specify thd->priv_host properly
2003-12-12 18:00:54 +04:00
hf@deer.(none)
757acc512d Fix for #2046
Just didn't notice that the mysql_connect function was implemeted
in libmysqld.c.
Implementation removed.
2003-12-10 11:04:58 +04:00
pem@mysql.com
24a2ae44a3 Merged 4.1 -> 5.0 2003-12-09 19:00:34 +01:00
monty@mysql.com
e8aef44349 Portability fixes for Windows 2003-12-08 12:25:37 +02:00
hf@deer.(none)
afd0b37816 SCRUM
WL#1246 (Query cache in embedded library)
2003-12-01 17:19:10 +04:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02: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
konstantin@mysql.com
975177fdb2 minor fix in rm 2003-10-31 17:13:42 +03:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
hf@deer.(none)
b04af44923 Fix for Windows bug reported throuhg Miguel 2003-10-21 16:05:17 +05:00
monty@mashka.mysql.fi
b1dba93cdb Safety fix to detect multiple calls to my_thread_end()
Portability fix (For Mac OS X)
2003-10-16 20:55:15 +03:00
pem@mysql.telia.com
689bb84f72 WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the
(updated) Protocol_cursor class.
Also did some bug fixes.
2003-10-10 16:57:21 +02:00
lenz@kallisto.local
2379030676 - added missing link line that seemed to have gone lost during the last
4.0->4.1 merge (mysqltest needs to be linked with a C++ compiler)
2003-10-08 13:06:47 +02:00
hf@deer.(none)
ce6f77a9c5 Fix for #1447 2003-10-06 18:01:11 +05:00
hf@deer.(none)
6b0112549e Fix for #1488 2003-10-06 17:06:05 +05:00
hf@deer.(none)
a5f9c695df Fix for #1487 2003-10-06 16:32:38 +05:00
hf@deer.(none)
f576380bc6 Fix for #1470 2003-10-06 12:09:20 +05:00
hf@deer.(none)
8bc13b1874 Fix for bugs #1437, #1446 2003-10-04 19:28:08 +05:00
hf@deer.(none)
73f2e739b2 Fix for #1430
there was an error about sendind prepared parameters to the server
2003-10-01 16:44:57 +05:00
hf@deer.(none)
9dcce9b0f3 fix for #1344
handling of init-file option added to embedded library
main problem was killing of output (resulting recordsets etc)
i added checks for empty output in Protocol:: methods
better solution could be special Protocol_nul class to redirect
results to nowhere
2003-09-29 21:07:53 +05:00
hf@deer.(none)
6d3d37c6f8 bugfix for #1375 2003-09-29 21:07:51 +05:00
hf@deer.(none)
cca80f8b58 SCRUM
embedded library
some fixes - cleanup procedure changed for embedded library - deletion of
embedded mysql->thd
2003-09-29 14:09:51 +05:00
hf@deer.(none)
5f8e7fef27 Merge 2003-09-26 15:40:26 +05:00
hf@deer.(none)
ba8fa76fa2 SCRUM:
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
2003-09-26 15:33:13 +05:00
hf@deer.(none)
192fcb9cc6 Bug fixed
null_string wasn't known in libmysqld/lib_sql.cc, that caused compiler's error
i put the declaration of the null_string in mysql_priv.h and renamed it
to my_null_string to reduce the probability of name's intersections
2003-09-25 13:02:45 +05:00
pem@mysql.telia.com
6e55a3428a Post-merge fixes. 2003-09-24 15:26:20 +02:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
hf@deer.(none)
0868446b3e SCRUM
embedded library
missed memory freeing added
2003-09-19 14:17:55 +05:00
hf@deer.(none)
cda32e123c SCRUM
prepared statements in embedded library.
some fixes after testing
2003-09-19 14:05:28 +05:00
hf@deer.(none)
e89e3ff753 SCRUM
embedded library
some dirty places cleaned:

uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library
2003-09-18 18:58:02 +05:00
hf@deer.(none)
0e059dcb74 SCRUM:
embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries

Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all
2003-09-18 18:28:42 +05:00
hf@deer.(none)
7dd4cb58d6 SCRUM
prepared statements in embedded library
2003-09-18 12:25:00 +05:00
hf@deer.(none)
ddbca4176d SCRUM:
prepared statements in embedded library
2003-09-17 20:48:53 +05:00
hf@deer.(none)
7a763f3fe3 SCRUM
prepared statements in embedded library
2003-09-17 15:18:18 +05: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
hf@deer.(none)
bf017a2eb0 SCRUM
Prepared statements in embedded server
Several changes in library code with two goals:
to make mysql_prepare_stmt working in embedded server
to get rid of #define mysql_interface_func mysql->methods->interface_func
in user's interface
2003-09-16 16:06:25 +05:00
hf@deer.(none)
e63e2229b6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-12 19:36:42 +05:00
hf@deer.(none)
9f3996cde9 SCRUM:
#977 Prepared statements in embedded library
2003-09-12 19:35:34 +05:00
lenz@mysql.com
9578d0b0ea - fixed yet another C++-style comment in a .c file that made the IBM
C compiler barf
2003-09-12 15:48:05 +02:00
lenz@mysql.com
edfbc3d3e8 Portability fixes:
- removed "-traditional-cpp" from the darwin6 compile flags, as it broke
   compilation with gcc-3.3 on Mac OS X and does not seem to be required 
   in general.
 - make sure to link libmysqld/examples/mysqltest.c with a C++ compiler, 
   as the embedded server library (libmysqld.a) includes C++ code. This
   broke compilation with non-gcc compilers.
2003-09-12 12:42:34 +02:00
hf@deer.(none)
efce59fc3f Monty's merge bug fixed 2003-09-12 13:44:41 +05:00
monty@mashka.mysql.fi
7538242e4f merge with 4.1 tree 2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
hf@deer.(none)
f434b329f5 SCRUM
embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'
2003-09-11 09:46:31 +05:00
hf@deer.(none)
fd77d78804 SCRUM: embedde library
Minor fixes
2003-09-10 12:58:26 +05:00
hf@deer.(none)
69283f8091 SCRUM: embedded library
mysql_fetch_length fixed for embedded library. Now data length is stored
before the data. Pointers in row still points to the data so you have to
get *(uint*)(data_ptr - sizeof(uint)) to get data length
2003-09-10 12:09:24 +05:00
monty@mashka.mysql.fi
99490870e6 Cleaned up last bug fixes
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
2003-09-09 20:06:50 +03:00
hf@deer.(none)
90bd948e1e fix for #1219 2003-09-08 18:49:23 +05:00
hf@deer.(none)
2ba517a3f1 fix for #1210 2003-09-08 13:11:18 +05:00
hf@deer.(none)
95bf984d15 Fix for #1210
i fixed this in 4.1 in slightly different way
2003-09-08 13:02:19 +05:00
hf@deer.(none)
c7297eba3e Fix for LOAD DATA to work with embedded library 2003-09-06 18:50:30 +05:00
hf@deer.(none)
bf3e65b128 SCRUM:
Fixed some mess with STDCALL in function's declarations
2003-08-28 13:39:46 +05:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _)
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
2003-08-27 02:51:39 +03:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02: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
hf@deer.(none)
a4f899dfc0 SCRUM - adding client into embedded server
error handling fixed
fetch_lengths made to work differently in embedded and client cases
2003-07-23 15:23:20 +05:00
hf@deer.(none)
cbff55a59d SCRUM
Including client code into embedded library
fixes
2003-07-18 16:26:35 +05:00
hf@deer.(none)
1b1a126aa1 Some mistakes fixed 2003-07-14 16:38:51 +05:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
guilhem@mysql.com
9c73d91d54 WL#912 (more user control on relay logs):
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
2003-07-06 17:59:54 +02:00
hf@deer.(none)
9d4bae335c Resolving conflicts 2003-07-04 13:21:14 +05:00
hf@deer.(none)
c224b55835 SCRUM
Including client code into embedded library

Code trimming (fixes of comments etc)
2003-07-04 11:40:10 +05:00
pem@mysql.com
6d225437ed Code cleanup (and moved sp cache to separate file). 2003-07-03 15:58:37 +02:00
monty@narttu.mysql.fi
1bd306ccd4 Fixed some new memory leaks
Updated VC++ files
2003-06-24 12:10:35 +03:00
hf@deer.(none)
1374a58cf3 SCRUM
client code added to the embedded library
some fixes
2003-06-19 16:38:21 +05:00
hf@deer.(none)
7e1ce534c9 SCRUM
including client code into embedded server
code to guess what library to use added
net_field_length moved to pack.c
2003-06-18 15:58:57 +05:00
hf@deer.(none)
c4e3a624b8 SCRUM
client capabilities included into libmysqld
some API methods became "virtual"
lots of duplicated code removed

IMHO all the above made library's code way more pleasant to look at, didn't it?
2003-06-17 21:32:31 +05: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)
9ad3c1cdca SCRUM:
splittiln common client's parts
2003-06-03 15:02:57 +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
hf@deer.(none)
e5428b2fe9 Lots of conflicts resolved 2003-05-28 13:54:58 +05:00
monty@narttu.mysql.fi
0688cf904b Removed not used variable 2003-05-28 03:36:44 +03:00
bar@bar.mysql.r18.ru
06acc76392 convert.cc was removed 2003-05-23 14:02:27 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
hf@deer.mysql.r18.ru
7a7e0e1575 SCRUM
common parts of libmysql.c and sql/mini_client.cc moved to sql-common/client.c
names of functions now are same in both cases
2003-05-02 21:07:41 +05:00
monty@narttu.mysql.fi
9e4f394e59 Fix reference to not initialized memory
Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
2003-04-30 10:15:09 +03:00
serg@serg.mylan
2f45dd04a0 followup to CURRENT_USER() fix 2003-04-29 15:11:45 +02:00
monty@mashka.mysql.fi
e741c893ea Fix to remove compiler warnings 2003-04-28 19:05:57 +03:00
pem@mysql.com
736e78251e Merging 4.1 to 5.0. 2003-04-04 13:45:35 +02:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
lenz@mysql.com
09c175a07a - Fix for bug #200 (added missing @WRAPLIBS@ to LIBS in
libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian
   for pointing this out)
2003-03-31 14:50:29 +02:00
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01: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
lenz@mysql.com
04071da35a - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)
2003-03-18 22:14:02 +01: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
monty@narttu.mysql.fi
3ec97824b7 Change dbug.h -> my_dbug.h (Portability fix)
Ensure that \ is not allowed in filenames, even on Unix
2003-03-17 19:06:14 +02:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
hf@deer.mysql.r18.ru
2be2914a82 Handling of log-error added in embedded server 2003-03-10 14:06:21 +04:00
monty@narttu.mysql.fi
d0d071dca9 Fix for using unitialized mutex when running version compiled with --debug 2003-03-04 15:02:49 +02:00
bell@sanja.is.com.ua
c37b62b79f postmerging fix (SCRUM) 2003-02-27 21:29:56 +02:00
lenz@mysql.com
654e857022 - removed duplicate my_sys.h inclusion from lib_vio.c
- removed obsolete compile options from compile-pentium-debug-openssl
2003-02-21 16:37:18 +01:00
venu@myvenu.com
7d24a79271 Another missed fix for Embedded Library (Windows specific) 2003-02-20 23:42:35 -08:00
venu@myvenu.com
b049692710 Minor tweak to fix the Netware portability to libmysqld 2003-02-20 15:40:58 -08:00
venu@myvenu.com
ee2b888696 Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM 2003-02-20 14:14:37 -08:00
pem@mysql.com
97dc6a528e Merging 4.1 into 5.0 2003-02-18 15:05:35 +01:00
pem@mysql.com
59dec76951 Added new files to libmysqld too. 2003-02-18 13:24:26 +01:00
bell@sanja.is.com.ua
352a338147 client port number added to SHOW PROCESSLIST (SCRUM?) 2003-02-17 22:07:26 +02:00
monty@mashka.mysql.fi
90bf074438 Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +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
monty@mashka.mysql.fi
9d000c323a Updated configure script to handle 1 digit numbers in MySQL version
Fixed a few typos from last patch
2003-02-12 23:17:22 +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
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
e3cd63521c Fix for MIN/MAX with empty tables
MIN(key_column) could in some cases return NULL on a column with NULL and other values.
MIN(key_column) and MAX(key_column) could in some cases return wrong values when used in OUTER JOIN.
2003-02-03 20:20:32 +02:00
serg@serg.mysql.com
170a142e08 ft_init_stopwords() in embedded 2003-01-27 00:14:12 +01:00
monty@mashka.mysql.fi
9af5e6b70a Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements) 2003-01-23 21:49:28 +02:00
serg@serg.mysql.com
3b1ed68875 auto-generated binary files deleted 2003-01-22 13:24:26 +01:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28: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
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677 SCRUM
embedded-related changes
2003-01-20 18:47:25 +04:00
monty@mashka.mysql.fi
8acc22296c Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
2003-01-18 16:39:21 +02:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
hf@deer.mysql.r18.ru
c59bff7c96 SCRUM
embedded library trimming
2003-01-15 12:11:44 +04:00
vva@eagle.mysql.r18.ru
6961e0069b fix some warnings 2002-12-21 02:53:07 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3 Merge 2002-12-19 14:57:24 +04:00
hf@deer.mysql.r18.ru
1873df00a5 several init commands fix 2002-12-19 12:27:46 +04:00
vva@eagle.mysql.r18.ru
9a0780cce0 fix warnings 2002-12-19 09:37:33 +04:00
hf@deer.mysql.r18.ru
bb67600df4 Merging 2002-12-17 19:57:23 +04:00
hf@deer.mysql.r18.ru
d8c700891e Merging&testing 2002-12-17 19:33:25 +04:00
vva@eagle.mysql.r18.ru
e5cc1ab97b Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1
2002-12-17 19:14:38 +04:00
vva@eagle.mysql.r18.ru
f3871cf9b4 Many init commands on connect 2002-12-17 19:13:07 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca Merging 2002-12-16 18:58:55 +04:00
hf@deer.mysql.r18.ru
e3b3b68307 Big purge about embedded library (scrum) 2002-12-16 17:33:29 +04:00
hf@deer.mysql.r18.ru
3517febe97 Resolving merge conflicts 2002-12-12 12:49:56 +04:00
hf@deer.mysql.r18.ru
dcb5293576 Some fixes 2002-12-12 12:16:34 +04: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
monty@mashka.mysql.fi
7e312565c3 Remove usage of acl_getroot() in embedded server.
Fixed compilation problem when OPENSSL was enabled.
2002-12-06 22:01:12 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
monty@mashka.mysql.fi
7d681c4449 Copy arguments given to mysql_server_init()
Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors.
2002-12-05 16:38:49 +02:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04: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
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
f86d328927 Added some compatibility modes (for the future) 2002-11-20 21:44:32 +02:00
bell@sanja.is.com.ua
7a9f47759e basic row Items (SCRUM) 2002-11-15 20:32:09 +02:00
hf@genie.(none)
25bd1e9a37 Merged by hands 2002-11-07 12:20:08 +04:00
hf@genie.(none)
3a7c12b22a Libmysqld improvements 2002-11-06 14:42:44 +04:00
ram@ram.(none)
e3a2033d41 fix for BDB 4.1.24 2002-10-31 17:06:23 +04:00
vva@genie.(none)
30a59d34ab addition correction for 'help' command 2002-10-30 17:38:07 +04:00
monty@hundin.mysql.fi
1e0538324d Added back old LARGEFILE handling
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind
2002-10-29 21:59:03 +02:00
serg@serg.mysql.com
1a1cafce63 merged 2002-10-25 22:07:04 +00:00
hf@genie.(none)
a6b0579fcd Some code improvements 2002-10-23 16:55:35 +05:00
hf@genie.(none)
8744bd0064 Embedded server bugfix 2002-10-21 09:56:30 +05:00
hf@genie.(none)
8a88791fb1 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
monty@hundin.mysql.fi
fbf6ab4465 merge with 4.0.5 2002-10-16 19:30:24 +03:00
serg@serg.mysql.com
fcb8bc061d merged 2002-10-14 11:36:48 +00:00
hf@genie.(none)
2be6f27219 Changes in order to trim embedded library code 2002-10-13 14:23:55 +05:00
miguel@hegel.br
a0de3a435b Builder C++ Embedded Server Sample 2002-10-13 03:08:44 -02:00
hf@genie.(none)
55866b0615 Huge pull 2002-10-07 15:38:07 +05:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
4d705988d5 Update libmysqld to use 4.1 protocol. 2002-10-02 14:14:36 +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
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
c85c33a5c1 Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
Fixed bug in SELECT ... ORDER BY ... LIMIT
Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names
Fixed hang when using --with-openssl
2002-09-16 15:55:19 +03:00
monty@mashka.mysql.fi
5ee7d7e73c Merge 2002-09-05 17:17: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
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@hundin.mysql.fi
5aa46cafe3 Updated VC++ dsp files from windows build machine
Remove some compiler warnings when using VC++
Add InnoDB in normal MySQL binary for windows.
2002-08-29 18:20:04 +03:00
monty@hundin.mysql.fi
f36f9d00ff Fixed bug in wait_for_update() that I had introduced.
Changed option variables to my_bool (to avoid bugs in my_getopt())
Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early.
Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
2002-08-22 16:50:58 +03:00
monty@hundin.mysql.fi
5773b6504a Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column.
Fixed bug in pthread_mutex_trylock with HPUX 11.0
2002-08-17 00:35:51 +03: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@mashka.mysql.fi
2c4fa340cc Lots of code fixes to the replication code (especially the binary logging and index log file handling)
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
2002-08-08 03:12:02 +03:00
hf@bisonxp.(none)
253c641900 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1
2002-08-03 20:26:44 +05:00
bar@bar.udmsearch.izhnet.ru
6340c79c05 Renamed some charset related constant
New fields in CHARSET_INFO for more nice SHOW CHARACTER SET
Dynamic charsets are now handled in faster way
SHOW CHARACTER SET now displays not only compiled charsets but dynamic charsets too
2002-07-30 14:02:29 +05: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
lenz@mysql.com
8ec2966ac0 Added missing file sql_olap.cc to libmysqld/Makefile.am to fix compile
failures when building the embedded server.
2002-07-22 14:07:04 +02:00
hf@bisonxp.(none)
7813e48076 Found bugs fixed 2002-07-11 13:43:21 +05:00
hf@bisonxp.(none)
bc7e8b0915 Minor fixes 2002-07-09 10:39:22 +05:00
jani@rhols221.adsl.netsonic.fi
7cad1f9313 Added interface for first set of dynamic variables. 2002-06-28 19:30:09 +03:00
monty@hundin.mysql.fi
33f84cf8fe Fixed bug in REPAIR table.
Portability fix in safemalloc.c
2002-06-28 15:06:04 +03:00
monty@hundin.mysql.fi
8a2daeac77 Removed mysql_ssl_clear()
Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.
2002-06-27 11:27:04 +03:00
monty@hundin.mysql.fi
6ccf4e50a2 Fixes for compiling distribution with MIT-threads 2002-06-20 23:26:39 +03:00
hf@bison.(none)
288c9464ce Small fixes 2002-06-18 20:35:34 +05:00
hf@bison.(none)
cc6407f1a5 Resolving of conflicts from pull 2002-06-17 17:14:20 +05:00
hf@bison.(none)
ede6ba5621 Removing net emulation out of embedded library 2002-06-17 16:24:51 +05:00
venu@myvenu.com
beb405d563 Makefile.am:
Added missing sql_prepare.cc & sql_error.cc to libmysqld
sql_error.cc, sql_prepare.cc:
  new file
2002-06-14 15:08:50 -07: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
8b785bc84c Fixed core dump bug in mysqltest
Added DBUG_ code to lib_vio.c
2002-05-26 16:53:57 +03:00
monty@hundin.mysql.fi
e68ebac9db Fixed some things to make MySQL to compile again. 2002-05-15 18:41:36 +03:00
monty@hundin.mysql.fi
48067f3cd6 Removed some long from mysqld comments (should be in manual). 2002-05-15 16:36:41 +03:00
bell@sanja.is.com.ua
e077890b04 simple subselects ported to new select_lex structures 2002-05-12 23:46:42 +03:00
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
monty@hundin.mysql.fi
2e2b146ba5 Fix for HAVE_QUERY_CACHE
Remove not used flag CLIENT_CHANGE_USER
2002-04-02 19:10:55 +03:00
sasha@mysql.sashanet.com
d3555002b7 fix to make the compile work with --with-other-libc 2002-03-30 16:24:30 -07:00
bar@gw.udmsearch.izhnet.ru
1c4138bf63 add sql_derived.cc into compilation 2002-03-29 19:27:21 +04:00
bar@gw.udmsearch.izhnet.ru
4b504da05d Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
2002-02-22 15:30:28 +04:00
bar@gw.udmsearch.izhnet.ru
735b27d578 Added GIS extension 2002-02-22 15:24:42 +04:00
monty@hundin.mysql.fi
6c4b4ad859 Fix after merge from 3.23 2002-02-15 02:49:02 +02:00
sasha@mysql.sashanet.com
8e43ad12c3 post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the
 new server getting started before the old one completely finished 
 shutdown. This should fix the pid warning we've been getting as well as
 inconsistent results when running tests with the manager
2002-01-22 15:05:11 -07: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
monty@hundin.mysql.fi
bea12d761a merge 2002-01-16 01:08:29 +02:00
monty@hundin.mysql.fi
4d10a0cb7e Add support for NULL=NULL in keys (Used in GROUP BY optimization)
Add ISAM to Windows version
Fix of test results
Fixes for NULL keys in HEAP tables.
2002-01-16 00:42:52 +02:00
miguel@light.local
558d88f977 Win32 Embedded Server Changes 2002-01-09 05:38:48 -02:00
monty@hundin.mysql.fi
b0ea238d2e merge 2002-01-02 22:02:03 +02:00
monty@hundin.mysql.fi
4b877e0088 Added macros for nice TIMESPEC usage.
Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.
2002-01-02 21:29:41 +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
4284a80049 Last changes after merge with 3.23.47 2001-12-15 06:00:01 +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
monty@hundin.mysql.fi
1d26537da5 Query cache.
Remove some warnings
2001-12-02 14:34:01 +02:00
monty@hundin.mysql.fi
5fedd2dda7 Fix for IO_CACHE.
Portability fixes.
2001-11-28 03:47:15 +02:00
monty@hundin.mysql.fi
777fdb5d5c Fixes for embedded version. 2001-11-25 13:50:48 +02:00
monty@hundin.mysql.fi
2ac4ad6984 merge 2001-11-03 22:28:16 +02:00
monty@hundin.mysql.fi
ccce9d031f Added STDCALL to mysql_sever and mysql_thread variables
Merged error messages with 3.23.44
Fixed bug with DATA DIRECTORY on windows
2001-11-03 21:33:11 +02:00
tim@black.box
0cbd4b7f9e Add sql/mf_iocache.cc to libmysqld sources list. 2001-10-29 12:37:32 -05:00
monty@hundin.mysql.fi
d121c2cdb9 Added missing files in libmysqld and the RPM spec file 2001-10-11 05:37:05 +03:00
tim@black.box
c0cd0f484a Add --without-isam configure switch.
Portability fix for mysqlmanager.
2001-10-09 18:11:44 -04:00
monty@hundin.mysql.fi
2eb83ad4e9 Don't depend on mit-pthreads include files when building libmysqld.a 2001-10-09 19:32:55 +03:00
monty@hundin.mysql.fi
d5fe1db868 One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
Portability fixes.
2001-10-09 03:35:29 +03:00
monty@hundin.mysql.fi
196f620e90 Portability fixes + a couple of bug fixes introduced by last push. 2001-10-08 23:20:19 +03:00
monty@hundin.mysql.fi
2f603156ed Cleanup after last merge 2001-10-08 07:24:04 +03:00
monty@hundin.mysql.fi
938a8dc2ef merge 2001-10-08 05:36:35 +03:00
monty@hundin.mysql.fi
88aff4bf85 Updated manual about embedded version.
Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86
2001-10-08 04:58:07 +03:00