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

379 commits

Author SHA1 Message Date
hf@deer.(none)
31304a38e4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.5066
 2004-08-24 14:24:14 +05:00
serg@serg.mylan
157a041baa bdb bugfix: LTLIBOBJS didn't take --disable-shared into account 
fix for bdb not ending up into libmysqld.a
 2004-08-23 13:55:40 +02:00
hf@deer.(none)
56a01acac5 Fix for bug #5066(Wrong result after subselect with an error) 
In this case we have to clear thd->data after errorneous query.
So i just move thd->data cleanup to emb_advanced_command
 2004-08-23 13:20:34 +05:00
hf@deer.(none)
c43d7d92dd Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-19 15:47:09 +05:00
hf@deer.(none)
0ce4b28b5e addition to fixes about #4700, 4701 2004-08-19 15:36:05 +05:00
konstantin@mysql.com
34ec6a2411 client_test.cc -> client_test.c 2004-08-03 18:58:35 -07:00
konstantin@mysql.com
d3e520ce7e Port of cursors to be pushed into 5.0 tree: 
- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
  state and has no additional locking wisdom.
  Lot's of it are to be rewritten.
 2004-08-03 03:32:21 -07:00
serg@serg.mylan
4665cec001 bug#4817 catalog name is "def" 2004-07-30 22:15:52 +02:00
konstantin@mysql.com
569d3c8488 WL#1518, "make bundled zlib usable for unix builds": 
required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb 
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts 
like AIX52 or HPUX11, where such a check is possible. It didn't compile 
there before as these systems dont't have installed zlib, so nothing got broken ;)
 2004-07-24 03:30:11 -07:00
pem@mysql.com
d1c454a6f4 Post-merge fix. 2004-07-23 18:54:01 +02:00
hf@deer.(none)
50183677cc Several fixes to make tests working for embedded library 2004-07-23 00:00:50 +05:00
hf@deer.(none)
94bfeb8393 Fixes for bugs in embedded library: 
#4700 (Unsigned value returned as signed)
    just no appropriate checking
#4701 (Errors returned earlier than expected)
    all errors returned from send_command()
#4702 (Result isn't freed properly if there's no retrieval)
    flush_use_result has only 'client' version and should
    be made 'virtual'
 2004-07-22 20:54:25 +05:00
miguel@hegel.(none)
58bdb6221c Export the stmt functions on Embedded Server 2004-07-21 19:29:08 -04:00
hf@deer.(none)
2a71cc26aa Fix for bug #4531(64bit embedded server crashes) 
There is some 'ulong'<->'uint' mess in libmysqld.c
 2004-07-21 18:23:13 +05:00
bell@sanja.is.com.ua
9336d36cf8 VIEW 
two TABLE_LIST copy eliminated
 2004-07-16 01:15:55 +03:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
konstantin@mysql.com
2ad9e516c8 A little fix in libmysqld: my_time.c was added twice. 2004-06-24 21:50:04 +04:00
konstantin@mysql.com
a30fcdc690 Fix for Bug#4030 "Client side conversion string -> date type doesn't 
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
  MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
 2004-06-24 19:08:36 +04:00
dlenev@brandersnatch.localdomain
09ba29e539 WL#1264 "Per-thread time zone support infrastructure". 
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
 2004-06-18 10:11:31 +04:00
monty@mysql.com
82a30d38b2 Removed not used file sql_olap.cc 2004-06-18 03:26:28 +03:00
hf@deer.(none)
da3667f63f fix for bug #3974 ("SHOW FULL PROCESSLIST" crashes the embedded server) 
server crashed checking thd->priv_user[0] and thd->priv_user is NULL
if NO_EMBEDDED_ACCESS_CHECKS is on.
Now i set it to be the same as thd->user
 2004-06-09 23:10:09 +05:00
monty@mysql.com
53d05f4adb Removed compiler warnings 2004-06-01 23:39:39 +03:00
monty@mysql.com
017096695a Update version number 
Fixed serbian error messages
Fix for windows regarding changed variable name
 2004-06-01 22:29:46 +03:00
monty@mysql.com
272c3a2669 After merge fixes 2004-05-27 02:50:42 +03:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
pem@mysql.com
71eddc362e Merging 4.1 to 5.0. 2004-05-26 17:04:45 +02:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
monty@mysql.com
96b6f0a686 Remove not needed sql_olap.cc from Makefile.am 2004-05-25 22:08:59 +03:00
monty@mysql.com
ca8dbc24ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/tmp/skr99/mysql-4.0
 2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c Added patches from Novell 2004-05-25 22:00:14 +03:00
monty@mysql.com
eca917b79c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-24 15:00:12 +03:00
monty@mysql.com
56c0258536 After merge fixes 
Remove compiler warnings
Update windows project files
 2004-05-24 14:42:34 +03:00
hf@deer.(none)
418dffe205 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.3744
 2004-05-21 22:00:12 +05:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
 2004-05-19 16:38:12 +03:00
hf@deer.(none)
bbfe390afd Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ps
 2004-05-17 18:45:50 +05:00
hf@deer.(none)
c00bc7a803 Proposed fix for #3744 (embedded server, wrong error message if database is 
missing)
 2004-05-17 12:05:57 +05:00
hf@deer.(none)
e18cd2ea9f Fixes for #3371, #3372, #3374, #3375, #3376 2004-05-15 17:07:44 +05:00
hf@deer.(none)
e81c6e1763 CXX linker specified for client_test with libmysqld 2004-05-14 21:00:29 +05:00
pem@mysql.com
df69f93ae9 Post-merge post-merge fix (new error codes for fparser). 2004-05-14 16:10:31 +02:00
hf@deer.(none)
a4bbf5d15b client_test with embedded library will be built so one can check if he broke 
something in embedded PS
 2004-05-13 10:30:42 +05:00
bell@sanja.is.com.ua
3c5cec08c0 file parser for new .frm 2004-05-11 23:23:49 +03:00
miguel@hegel.local
6fcfc63962 Removing VC++ compiler warnings 2004-05-10 22:25:51 -03:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
lenz@mysql.com
fc9a339294 - disabled the NDB Cluster from the embedded server 
- added compiling of the NDB Cluster to compile-pentium-max
 2004-04-26 22:37:42 +02:00
tomas@mc05.(none)
95c87cfa9c Makefile.am: 
fix for embedded server and ndbcluster make
 2004-04-18 16:00:51 +02:00
magnus@neptunus.(none)
e421eea5cb Add discover.cc to libmysqld Makefile 2004-04-16 11:31:02 +02:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
monty@mysql.com
70c4eb5838 Portability fixes 
Fixed problems with group_concat() and HAVING
Updated crash-me values
 2004-04-07 04:33:58 +03:00
monty@mysql.com
42cf92ce37 Fixed many compiler warnings 
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
 2004-04-05 13:56:05 +03:00
konstantin@mysql.com
889790a15c Simplification: MYSQL_RES *result replaced with MYSQL_DATA result; 
No need to check for result existence any more, store_result functions
now are shorter.
cli_read_binary_rows rewritten to handle MYSQL_DATA directly.
 2004-03-28 17:22:04 +04:00
hf@deer.(none)
2fc0fa6670 Small fix to embedded library 
we should call check_user in NO_EMBEDDED_ACCESS_CHECKS case
to do necessary initializations
 2004-03-27 15:27:36 +04:00
monty@mysql.com
75dda82526 Removed compiler warning 
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
 2004-03-18 14:53:38 +02:00
hf@deer.(none)
afc8eace7f Fix for #1325 
We just tried to open binlog's file twice in embedded server
 2004-03-13 20:11:41 +04:00
konstantin@oak.local
082a01d1e0 Rename: 
read_statistic -> read_statistics
(statistic is adjective)
 2004-03-10 20:12:24 +03:00
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