Commit graph

697 commits

Author SHA1 Message Date
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