mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6623 commits 2788 branches 343 tags 1.7 GiB
Commit graph

129 commits

Author SHA1 Message Date
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
bar@bar.mysql.r18.ru
09eac4793b bin chatset now handles strnncoll itself so we don't have to check 
if charset is binary anymore
 2003-01-14 18:28:50 +04:00
monty@mashka.mysql.fi
7e9b27eaf5 Updates for multi-byte character sets 
(Note: test 'union' fails, but Sanja promised to fix this)
 2003-01-14 14:28:36 +02:00
bar@bar.mysql.r18.ru
a89df5a096 Separating CHARSET and COLLATION terms 2003-01-09 15:37:59 +04:00
monty@mashka.mysql.fi
f9772317ee merge 2003-01-04 15:40:55 +02:00
venu@myvenu.com
33cfbc7894 Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2003-01-03 23:44:24 -08:00
venu@myvenu.com
fc7a1bfacf Fix date,time,timestamp,year - binary protocol 2003-01-03 23:37:16 -08:00
Sinisa@sinisa.nasamreza.org
164ab11b29 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-01-03 15:08:40 +02:00
venu@myvenu.com
881c9808a4 Merge myvenu.com:/home/venu/bk/src-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-01-03 03:54:18 -08:00
venu@myvenu.com
5c4b7a2e96 Binary protocol changes (to monty) 2003-01-03 03:52:53 -08:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
Sinisa@sinisa.nasamreza.org
885d9d9037 A fix for a charset bug in the select_export (select into 
outfile) class.
 2002-12-31 18:01:53 +02:00
Sinisa@sinisa.nasamreza.org
a4a80302b8 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-12-30 19:42:03 +02:00
miguel@hegel.br
f43ebb83db Fix compiler warnings removing unreferenced variables 2002-12-29 21:50:52 -02:00
Sinisa@sinisa.nasamreza.org
1e2bec8009 aliases with multi-table updates / deletes 
fix for a bug with derived tables and query cache
ix for a charset bug in timestamp
 2002-12-28 21:34:17 +02:00
bar@bar.mysql.r18.ru
e5103ce714 Less "default_charset_info" 2002-12-19 15:27:46 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3 Merge 2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
fbad8dc364 less use of system_charset_info 2002-12-19 09:38:30 +04:00
bar@bar.mysql.r18.ru
1bba969b1e removed several cases of default_charset_info use 
a bit more ucs2 compatibility
 2002-12-19 09:38:29 +04:00
bar@bar.mysql.r18.ru
6ac401b550 thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
hf@deer.mysql.r18.ru
bb67600df4 Merging 2002-12-17 19:57:23 +04:00
bar@bar.mysql.r18.ru
e56fb1962f sql_type() is now ucs2 compatible 2002-12-17 19:57:22 +04:00
bar@bar.mysql.r18.ru
0ce4ae35e5 Some fixes to get closer to UCS2 compatible SHOW FIELDS 2002-12-17 14:35:19 +04:00
bar@bar.mysql.r18.ru
4f2a57c511 Move all sql_type() to the same file 2002-12-17 11:25:27 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca Merging 2002-12-16 18:58:55 +04:00
monty@mashka.mysql.fi
d783e18436 merge 2002-12-14 17:49:01 +02:00
monty@mashka.mysql.fi
d49167bae5 Fixes for binary protocol (complement to last push) 
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
 2002-12-14 17:43:01 +02: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
e7164aba7e Add CHARSET keyword (missing from last push) 2002-12-11 21:22:57 +02:00
bar@bar.mysql.r18.ru
b4fcdaa276 Preparation to charset dependant test_if_int and test_if_real 2002-12-11 17:42:48 +04:00
bar@bar.mysql.r18.ru
40f828d5f1 Some system_charset_info and default_charset_info were replaced by my_charset_latin1 2002-12-11 17:12:55 +04:00
bar@bar.mysql.r18.ru
34033b9389 Use of charset dependant num->string conversion routines 2002-12-11 16:04:46 +04:00
bar@bar.mysql.r18.ru
e870df661d Use of new num->str functions 
fix in ucs2 charset
 2002-12-11 15:29:23 +04:00
monty@mashka.mysql.fi
a241d9a0f7 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-12-11 09:18:43 +02: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
bar@bar.mysql.r18.ru
857d447e23 More new style str->num 2002-12-10 12:43:17 +04:00
bar@bar.mysql.r18.ru
632dff01d1 More use of new str->num functions 2002-12-09 15:45:05 +04:00
bar@bar.mysql.r18.ru
241f4143e8 More use of new string->number conversion routines 2002-12-09 14:31:11 +04:00
bar@bar.mysql.r18.ru
072abca49b Use of new string->number conversion routines 2002-12-09 14:08:42 +04:00
monty@mashka.mysql.fi
35ff08c2af After merge fixes 
Added THD to add_to_xxx_list() functions for faster parsing.
 2002-12-06 21:11:27 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
monty@mashka.mysql.fi
fc06433a69 Removed copying of parameters as this leads to memory leaks in embedded server. 
Fixed 'not initialized' memory error.
 2002-12-05 03:40:33 +02:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
bar@bar.mysql.r18.ru
d2e5a5ddd2 More use of new string->number conversion functions 2002-11-28 11:33:04 +04:00
bar@bar.mysql.r18.ru
95930f129e new string-to-number functions 2002-11-27 18:08:31 +04:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@butch.
890b39bb68 merge 2002-11-07 12:49:01 +02:00
hf@genie.(none)
25bd1e9a37 Merged by hands 2002-11-07 12:20:08 +04:00