Commit graph

238 commits

Author SHA1 Message Date
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
peter@linux.local
f85a002c68 Merge 2002-06-14 15:24:22 +04:00
peter@linux.local
d505803728 This is just code style/minor optimizations cleanup changeset 2002-06-14 15:14:30 +04:00
monty@mashka.mysql.fi
b8421d34ec Added the following new privleges:
SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE

All scripts & documentation is updated for this change.
Added better error messages for global privileges
2002-06-12 15:04:18 +03:00
peter@linux.local
89b161d05d This changeset is mostly new version of previous commit modified according
to Monty's code style and optimization comments
2002-06-11 13:37:48 +04:00
monty@mashka.mysql.fi
2aecdd1a91 Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
2002-06-11 11:20:31 +03:00
monty@hundin.mysql.fi
ab1a273198 Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 2002-06-04 11:39:33 +03:00
monty@hundin.mysql.fi
f0b28da6f9 merge with 4.0 2002-06-03 12:59:31 +03:00
monty@hundin.mysql.fi
6e54cc492c Extension of .frm file (not yet ready for push) 2002-06-02 21:22:20 +03:00
bar@gw.udmsearch.izhnet.ru
660844acd6 Changed 003F -> 0000 for undefinite characters in charset.conf
Charset convertion FROM dynamic charset is now working too
Allow dynamic charsets in CONVERT()
2002-06-02 21:32:02 +05:00
monty@hundin.mysql.fi
3cfdd984f0 merge 2002-05-19 11:10:06 +03:00
bar@gw.udmsearch.izhnet.ru
196aa19cf6 Now string values are created and filled with charset field
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
2002-05-17 16:29:52 +05:00
monty@hundin.mysql.fi
73392ebee1 Fix bug in CONCAT_WS()
Update of glibc patch from MySQL 4.0
2002-05-17 10:50:57 +03:00
bar@gw.udmsearch.izhnet.ru
79fb335f32 Fix for AsText() spatial function 2002-04-18 11:53:59 +05:00
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
monty@tik.mysql.fi
e857f561fd Fix for INET_NTOA(N) when N >= 2^32 2002-04-06 18:47:54 +03:00
monty@hundin.mysql.fi
6e247490dc Merge 2002-04-02 19:46:26 +03:00
monty@hundin.mysql.fi
dfd7f455e4 Fixed help typos in mysql.cc 2002-04-02 17:42:01 +03:00