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

101 commits

Author SHA1 Message Date
konstantin@mysql.com
a0bc131743 Merge mysql.com:/home/kostja/work/mysql-4.1-7428 
into mysql.com:/home/kostja/work/mysql-5.0-root
 2005-01-11 14:47:12 +03:00
konstantin@mysql.com
876a96cd02 make it compile with -ansi -pedantic 2005-01-11 13:12:52 +03:00
guilhem@mysql.com
b5a44aebbd Merge mysql.com:/home/mysql_src/mysql-4.1-clean 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-10 15:15:49 +01:00
guilhem@mysql.com
da1d751b31 Merge mysql.com:/home/mysql_src/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-10 14:13:41 +01:00
guilhem@mysql.com
3439ce4ee3 Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]": 
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.
 2005-01-10 13:52:32 +01:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
petr@mysql.com
fd94614f34 merge 2004-12-09 04:22:28 +03:00
ram@gw.mysql.r18.ru
bd247e3d56 A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet). 2004-12-06 18:45:41 +04:00
pem@mysql.comhem.se
a7ee4f336f Various build fixes. 2004-11-12 12:28:34 +01:00
petr@mysql.com
b2e3626e52 fix for the IM linking problem 2004-11-06 02:14:56 +03:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
petr@mysql.com
7896c6c397 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/im/prereview/mysql-5.0
 2004-11-04 02:57:31 +03:00
monty@mysql.com
2185f1a56c Remove usage of !$ from mysql-tests 
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
 2004-11-02 20:13:27 +02:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
petr@mysql.com
a8e2db4ecd Intermediate commit - just to make new files visible to bk in the new 
tree
 2004-10-23 11:32:52 +04:00
jani@rhols221.adsl.netsonic.fi
fe23df1a2b Added per thread status variables, after review, patch v1.1. 2004-09-13 16:48:01 +03:00
konstantin@mysql.com
48162f9653 A fix and test case for Bug#5194 "Bulk Insert Failures with Prepared 
Statements": 
- fix a couple of net->buff overruns in libmysql,
- check in the server that statement parameter count is less than
  65535 (maximum value supported by prepared statements protocol).
 2004-09-08 23:07:11 +04:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
monty@mysql.com
1388c164bc After merge fixes 
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
 2004-06-21 10:21:20 +03:00
serg@serg.mylan
429a165995 c++ comment fixed 2004-02-21 14:25:43 +01: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
pem@mysql.comhem.se
d8bf426b80 Fixed BUG#1965: Opening a cursor hangs client when malformed select fails 
and BUG#1966: "select 1 into a" on top-level hangs client
 2003-11-27 16:48:21 +01:00
monty@mishka.mysql.fi
c22c1d8a4d merge 2003-09-24 10:24:56 +03:00
lenz@kallisto.local
5ce5a68b4e - Code cleanup: replaced C++-style comments with the proper syntax for 
.c files (the IBM Visual Age C compiler aborts with a syntax error
   on these)
 2003-09-24 08:35:02 +02:00
monty@mashka.mysql.fi
f300e3a164 Remove 'extern' references from .cc files 2003-09-13 11:35:29 +03:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03: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
monty@narttu.mysql.fi
359846f052 Fixed some varnings from valgrind 
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
 2003-08-20 16:25:44 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
hf@deer.(none)
6b303f846b Including client code into libmysqld 
Merging
 2003-07-14 16:41:58 +05:00
serg@sergbook.mylan
db22d366ce comment clarified 2003-07-09 13:00:44 +02: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
monty@mashka.mysql.fi
5f556f11e0 Fixed memory allocation in Unique to not allocate too much memory 2003-06-26 07:56:55 +03: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
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
monty@narttu.mysql.fi
4851b571bb Merged fix for alarm on big blocks 2003-06-05 15:21:10 +03:00
monty@narttu.mysql.fi
de0a3d3036 Fixed test if thr_alarm() failed 2003-06-05 15:15:27 +03:00
monty@narttu.mysql.fi
772adcbd99 Print error if we can't delete an alarm 
More debugging variables
Increment aborted_threads in case of killed or too big packet
 2003-06-05 12:29:13 +03:00
monty@narttu.mysql.fi
aeb655e04c Merge with 3.23 to get fix for thr_alarm and big packets 2003-06-05 12:00:06 +03:00
monty@narttu.mysql.fi
cd3b680db0 Fixed problem with alarms when reading too big packet 2003-06-05 11:55:03 +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
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@mashka.mysql.fi
3e6c350f64 Fixed bug in SUM() with NULL:s 
Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows
 2003-04-15 22:04:16 +03:00
lenz@mysql.com
a355f74bf7 - fixed C++-style comments in .c files to make IBM compiler happy 
(it barfs on these with a syntax error)
 2003-03-11 15:37:31 +01:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
monty@mashka.mysql.fi
803dff1002 Merge with 4.0.8 2003-01-06 02:04:52 +02:00
Sinisa@sinisa.nasamreza.org
0ccaf94016 Fixing that 3.23 API / clients do not disconnect if a large 
packet is issued.
 2003-01-04 21:02:58 +02:00
monty@mashka.mysql.fi
6d5ad61a11 Added support for max_allowed_packet in option files read by mysql_option() 
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.
 2003-01-04 15:17:16 +02:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00