bell@sanja.is.com.ua
c1527b6f4c
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-11-28 20:04:09 +02:00
bar@bar.mysql.r18.ru
d2e5a5ddd2
More use of new string->number conversion functions
2002-11-28 11:33:04 +04:00
bell@sanja.is.com.ua
4be2cfd62d
merging
2002-11-27 19:31:11 +02:00
monty@mashka.mysql.fi
3d1af24f0f
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
2002-11-25 17:34:51 +02:00
monty@mashka.mysql.fi
4cefc97f65
Fixed CAST( xxx as CHAR)
2002-11-25 17:33:51 +02:00
peter@mysql.com
d2aa1fb8e7
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-11-24 17:35:24 +03:00
peter@mysql.com
925155cf5a
Merge....
2002-11-24 17:26:26 +03:00
peter@mysql.com
35ccfd0b42
SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit
...
done for merge with newer version of code.
2002-11-24 17:07:53 +03:00
bell@sanja.is.com.ua
2eb623a4f0
prevent using references on sum function (except HAVING clouse of current select) and forward references
2002-11-21 11:01:33 +02:00
bell@sanja.is.com.ua
7a9f47759e
basic row Items (SCRUM)
2002-11-15 20:32:09 +02:00
bar@bar.mysql.r18.ru
442509acdd
USER(), DATABASE() and CHARSET() functions are now UCS2 compatible
...
Bug fix in ctype-utf8.c
2002-11-11 18:43:33 +04:00
bar@bar.mysql.r18.ru
098b974483
For coding convenuence cs->mbmaxlen is now 1 for 8bit charsets
2002-11-11 13:10:39 +04:00
peter@mysql.com
04d140538a
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-11-06 18:51:20 +03: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
86b633379c
Some charset code clean-ups
2002-11-06 17:01:12 +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
cc18dc7291
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-30 18:03:09 +03:00
bar@bar.mysql.r18.ru
b43876b9dd
All String->set() now have charset argument
2002-10-30 16:19:43 +04:00
peter@mysql.com
1545cbccd3
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-27 13:13:31 +03:00
bar@bar.mysql.r18.ru
95aef91521
BINARY charset is now used instead of binary_flag
2002-10-25 13:58:32 +05:00
peter@mysql.com
d21402052c
One more commit to do the merge of new 4.1 tree
2002-10-06 13:42:16 +04:00
peter@mysql.com
de57e9ba35
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
...
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-03 22:48:53 +04:00
peter@mysql.com
f3c51eec31
One more commit required to merge second pack of Monty's patches
2002-10-03 22:42:13 +04:00
monty@mashka.mysql.fi
62a26cf891
Update after last merge. Fixes some wrong test results.
2002-10-03 16:54:26 +03:00
peter@mysql.com
66b1435ee2
Merging...
2002-10-03 00:13:08 +04:00
peter@mysql.com
f1155a98a4
Changeset to deal with 4.1 -> 4.0 merge
2002-10-02 23:43:27 +04:00
monty@mashka.mysql.fi
0f39457613
Merge with 4.0.4
2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
a748b35ddd
merge with work
2002-10-02 13:45:16 +03: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@mashka.mysql.fi
7f55d92637
fixed so that --ssl and --skip-ssl works with the MySQL clients.
...
Fixed core dump bug when sending wrong string to AES_DECRYPT()
2002-09-17 23:46:53 +03:00
bar@bar.mysql.r18.ru
ad91c3b77d
Fixed that:
...
SELECT * FROM t WHERE (c COLLATE latin1) >'a'
might fail in some cases
2002-09-13 14:11:06 +05: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
monty@hundin.mysql.fi
5aa46cafe3
Updated VC++ dsp files from windows build machine
...
Remove some compiler warnings when using VC++
Add InnoDB in normal MySQL binary for windows.
2002-08-29 18:20:04 +03:00
bar@bar.mysql.r18.ru
dd5382187e
Fix that this didn't work as far as sorting for ORDER BY was removed by optimizer:
...
SELECT k FROM t1 GROUP BY k COLLATE latin1 ORDER BY k COLLATE latin1_de
2002-08-26 17:33:44 +05: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
bar@bar.mysql.r18.ru
faaddbd214
Stupid bug fixes in sql_yacc.cc
...
New class Item_func_set_collation()
Fixed that "SELECT CONVERT(expr USING charset) GROUP BY 1" was not working
New COLLATION syntax: <expr> COLLATE latin1
2002-08-22 18:12:45 +05:00
monty@hundin.mysql.fi
c99c1fd384
Changed IF(expr, column, NULL) to take type from column
...
Fixed some windows portability problems and removed some compiler warnings
Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
2002-08-12 03:33:46 +03:00
ram@ram.(none)
deaec7b0e0
QUOTE() code cleanup
2002-08-10 15:13:05 +05:00
ram@ram.(none)
390678905b
added NULLs check to the QUOTE() function
2002-08-09 19:36:36 +05:00
ram@ram.(none)
b43eb82b10
QUOTE() func changes according to monty's suggestions
2002-08-09 15:42:38 +05:00
ram@ram.(none)
b7403f3d84
new QUOTE() fuction has been added
2002-08-08 20:25:53 +05:00
monty@mashka.mysql.fi
dddc20d9d1
New SET syntax & system variables.
...
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
2002-07-23 18:31:22 +03:00
bell@sanja.is.com.ua
0c6cb114e2
subselect clean up
...
fix after automerge
2002-07-01 19:06:24 +03:00
bar@gw.udmsearch.izhnet.ru
2e1285f296
Fix
2002-06-27 19:00:49 +05:00
bar@gw.udmsearch.izhnet.ru
a3d8e08695
SELECT DISTINCT CONVERT(field USING charset) now works properly
2002-06-26 18:08:33 +05:00
bar@gw.udmsearch.izhnet.ru
337d46966c
Several problems were fixed (mostly BLOB+charset related)
...
Fixed that MyISAM were not working properly with non-8bit charsets in some cases
CONVERT() function now works properly
2002-06-26 16:00:43 +05:00
peter@linux.local
53ea45699b
Minor compilation fix
2002-06-22 11:44:46 +04:00
bar@gw.udmsearch.izhnet.ru
c5b8f48cf5
New CHARSET() function
2002-06-20 23:26:04 +05:00
bar@gw.udmsearch.izhnet.ru
44347c5a54
SELECT left(non_default_charset_field,n) GROUP BY 1
...
now works more correctly. Still needs fixes.
2002-06-20 22:52:56 +05:00
monty@hundin.mysql.fi
0d8e13979d
Made keyread (key scanning) a key specific attribute.
...
This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.
2002-06-19 00:22:30 +03:00
