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
monty@hundin.mysql.fi
db6cbba239
Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
2002-11-07 04:03:44 +02:00
monty@hundin.mysql.fi
65badfff1a
Put temporary files in binlog cache when using BEGIN/COMMIT
...
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
2002-11-07 04:02:37 +02:00
monty@butch.
a2bdf9265f
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
2002-11-07 03:54:00 +02:00
bar@bar.mysql.r18.ru
2434be61f8
String->copy() now has a charset arg
2002-11-06 17:43:22 +04:00
bar@bar.mysql.r18.ru
9a9e7ce0f4
Item->thd_charset() - returns a default charset which should be used
...
to compose strings appeared without charset context, for example,
in convertion from numer into string type.
2002-11-06 15:49:53 +04:00
peter@mysql.com
5968a5ea25
Final decimal bug fix changeset (hope)
2002-11-06 12:35:16 +03:00
peter@mysql.com
043ea441d7
Decimal field fix overflow
2002-10-30 19:39:52 +03:00
bar@bar.mysql.r18.ru
03e7fc3180
date and time fields now have charset arg in constructor
...
my_charset_latin1
2002-10-30 17:09:37 +04:00
bar@bar.mysql.r18.ru
b43876b9dd
All String->set() now have charset argument
2002-10-30 16:19:43 +04:00
bar@bar.mysql.r18.ru
440db4c1dc
ENUM/SET fields now have charset too
2002-10-25 15:08:47 +05:00
bar@bar.mysql.r18.ru
95aef91521
BINARY charset is now used instead of binary_flag
2002-10-25 13:58:32 +05:00
hf@genie.(none)
8a88791fb1
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
peter@mysql.com
79978dcb0e
Fix exponent overflow handling for decimal type. Overflow lead to crash
2002-10-13 21:11:01 +04:00
bar@bar.mysql.r18.ru
50c391538a
my_sortcmp -> my_strnncoll
2002-10-09 16:33:35 +05:00
bar@bar.mysql.r18.ru
954a47b95a
Simple charsets now have strncoll() field too
2002-10-09 15:40:57 +05:00
hf@genie.(none)
55866b0615
Huge pull
2002-10-07 15:38:07 +05:00
hf@genie.(none)
71d0f48f1f
Geometry field type implementation
2002-10-04 12:48:32 +05:00
monty@mashka.mysql.fi
d69250a969
Fixes and code cleanups after merge with 4.0.3
...
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
monty@narttu.mysql.fi
7134ffec21
Merge with 4.0.3
...
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
Sinisa@sinisa.nasamreza.org
22bcce253e
Adding a necessary functionality to ::store and ::save_in_field
...
that will take place properly after pull from 4.0, in order to
handle conversions from quoted constants to bigint's.
2002-08-24 14:49:04 +03:00
