mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12744 commits 2781 branches 343 tags 1.6 GiB
Commit graph

125 commits

Author SHA1 Message Date
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
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
af44187bff Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40 New MYSQL_SERVER_SUFFIX usage (for easier compilation) 
Update of VC++ project files.
 2004-05-25 02:28:44 +03:00
konstantin@mysql.com
f207b33a7b Support for character set conversion in binary protocol: another go 
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first.
 2004-05-25 02:03:49 +04:00
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +02:00
monty@mysql.com
939ea71ecd Portability fixes 
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
 2004-05-07 01:43:17 +03:00
konstantin@mysql.com
aec8522569 Fix for Bug#3035 "Prepared statement integer inserts": now unsigned 
flag is sent to server with placeholder types.
There were no need to extend the protocol as one additional byte
was reserved for placeholder code, when placeholder code is in range 0-255.
So this byte is now used for flags. Post-review fixes added.
 2004-04-30 03:00:19 +04:00
serg@serg.mylan
3b6c3dd2f5 escaping all molty-statement macro 2004-04-07 22:16:16 +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
konstantin@mysql.com
36120d420a Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc 
exceed unsigned long limit.
 2004-03-15 22:39:36 +03:00
paul@ice.local
6eaf03125d Fix bruxism-inducing typo so I can sleep at night. 2004-03-01 17:25:21 -06:00
monty@mashka.mysql.fi
cdaf7fcbc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2004-02-19 19:38:47 +02:00
monty@mashka.mysql.fi
e347f63192 Max open files handling moved to my_set_max_open_files() 
This ensures that my_file_info takes this the max number of files into account and one can now use --open-files-limit on windows to increase number of used files up to 2048
 2004-02-19 19:33:09 +02:00
serg@serg.mylan
6af8a93052 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-17 17:07:14 +01:00
serg@serg.mylan
b8e161be4b if a key length exceeds the supported maximum and it is safe to auto-decrease it, do it. 2004-02-17 16:57:39 +01:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
serg@serg.mylan
5914e5705c my_atof is deleted 
strtod from mit-threads is restored and cleaned up
 2004-02-13 15:27:21 +01:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
serg@serg.mylan
2a45f3ee16 include atomic.h in extern "C" mode 2004-02-05 23:13:04 +01:00
hf@deer.(none)
c13f757c43 SCRUM 
WL#1163 (Make spatial code separable)
fixes before the push
 2004-01-23 19:54:22 +04:00
sergefp@mysql.com
23b25675f2 Merge mysql.com:/home/psergey/mysql-5.0-latest-pull 
into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique
 2003-12-20 00:54:38 +03:00
sergefp@mysql.com
a8456e6801 Numerous small fixes to index_merge read time estimates code 2003-12-20 00:53:14 +03:00
pem@mysql.com
99e0ae85c7 Merge 4.1 to 5.0. 2003-12-19 18:03:27 +01:00
monty@mysql.com
eeff10e4c1 merge 2003-12-19 16:34:48 +02:00
ram@gw.mysql.r18.ru
33ca68a205 MYSQL_UNIVERSAL_CLIENT_CHARSET definition has been added. 2003-12-19 14:12:29 +04:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
monty@mysql.com
d47deebb58 Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105) 
Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846)
Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812)
One can now configure MySQL as windows service as a normal user. (Bug #1802)
Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736)
IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704)
Change INSERT DELAYED ... SELECT... to INSERT .... SELECT (Bug #1983)
Safety fix for service 'mysql start' (Bug #1815)
 2003-12-14 06:39:52 +02:00
konstantin@mysql.com
3248878cf1 typo fixed 2003-12-05 19:20:06 +03:00
konstantin@mysql.com
b5bef29564 attempt to make ULONGLONG_MAX work on Windows. 2003-12-05 12:52:07 +03:00
konstantin@mysql.com
cf192063d1 Post-review fixes for bug #1790 'BIT_AND() result in GROUP BY different when 
SQL_BIG_RESULT used':
- BIT_AND now returns BIGINT UNSIGNED
- in case there were no matching rows BIT_AND returns 18446744073709551615 
(but not NULL), BIT_OR returns 0 (but not NULL). That's how Monty wants it
and how is described in our docs.
 2003-12-02 19:39:51 +03:00
pem@mysql.com
6e717133c5 Merge 4.1 to 5.0 2003-12-01 16:14:40 +01:00
monty@mashka.mysql.fi
ac76198330 Portability fixes for AIX43 2003-11-20 02:48:09 +02: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
igor@rurik.mysql.com
f29ed57531 Merge 2003-10-30 10:45:28 -08:00
serg@serg.mylan
52c353de94 correct casting in ulonglong2double 2003-10-27 11:18:44 +01:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
dlenev@mysql.com
1c11077d60 Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with 
their newer DES_ versions.
Provided macros for backward compatibility.
 2003-09-12 22:33:43 +04:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
igor@rurik.mysql.com
40193a7fa5 Manual merge 2003-08-26 00:13:22 -07: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
igor@rurik.mysql.com
9306f55d8e Many files: 
Added key cache assignment
mi_locking.c:
  Added key cache assignment: correction
my_sys.h:
  Added key cache variable structure
 2003-08-02 02:43:18 -07:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00