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

8388 commits

Author SHA1 Message Date
lars@mysql.com
424ff9741d Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b5551-4.1-v4
 2004-11-03 18:24:44 +01:00
lars@mysql.com
485de9cbb7 Fix for bug#5551 (Version 4). 
The idea of the fix is that the administrative statements 
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not 
generate binlog errors if there is no errors on the master.
 2004-11-03 18:23:58 +01:00
monty@mysql.com
60691a637a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2004-11-03 18:52:03 +02:00
mskold@mysql.com
700da57918 Fix for bug#6398 update of primary key fails 2004-11-03 15:53:26 +01:00
pem@mysql.comhem.se
327eb9bbff Various syntax fixes in sql/sql_yacc.yy for stored procedures: 
- No RESTICT|CASCADE in DROP SP (since it's not implemented)
  - Added optional "noise" to FETCH: [[NEXT] FROM]
  - At least one statement required in all block constructs except BEGIN-END
    (where zero is allowed)
 2004-11-03 13:49:54 +01:00
bar@mysql.com
45451568bf opt_range.cc, range.result, range.test: 
Bug #6045: Binary Comparison regression in MySQL 4.1
  Binary searches didn't use a case insensitive index, now they do.
 2004-11-03 15:22:33 +04:00
monty@mysql.com
7d3be517a4 Merge on pull 2004-11-03 13:01:38 +02:00
monty@mysql.com
47bbf768d4 Fixes after merge with 4.1 
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
 2004-11-03 12:39:38 +02:00
marko@hundin.mysql.fi
73bb6b9c33 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
 2004-11-03 11:09:41 +02:00
monty@mysql.com
8ba52759a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-02 21:40:55 +02:00
monty@mysql.com
2185f1a56c Remove usage of !$ from mysql-tests 
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
 2004-11-02 20:13:27 +02:00
timour@mysql.com
7031a0b026 fixed spelling 2004-11-02 20:11:00 +02:00
rburnett@build.mysql.com
8b472a7605 Bug# 5303 Windows --log-error option doesn't work correctly 2004-11-02 18:18:21 +01:00
monty@mysql.com
f5c77f6a06 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-11-02 18:54:16 +02:00
timour@mysql.com
09f1c7096c WL#1972 "Evaluate HAVING before SELECT select-list" 
- Changed name resolution for GROUP BY so that derived columns do not shadow table columns
  from the FROM clause. As a result GROUP BY now is handled as a true ANSI extentsion.
- Issue a warning when HAVING is resolved into ambiguous columns, and prefer the columns from
  the GROUP BY clause over SELECT columns.
 2004-11-02 18:23:15 +02:00
ram@gw.mysql.r18.ru
86b33f360b A fix (bug #6331: INSERT IGNORE .. SELECT breaks subsequent inserts). 2004-11-02 19:48:37 +04:00
gluh@gluh.mysql.r18.ru
4c65a9447e WL#1437 :don't create new users with GRANT 2004-11-02 17:45:26 +03:00
bar@mysql.com
97ecfced53 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-11-02 16:02:52 +04:00
bar@mysql.com
6a3b1d443f Many files: 
Allow mixing of different character sets for more SQL functions.
item_func.h:
  Allow mixing of different character sets for more SQL functions..
 2004-11-02 16:02:12 +04:00
heikki@hundin.mysql.fi
c68ea1665c ha_innodb.cc: 
Correct English grammar
 2004-11-02 13:34:11 +02:00
heikki@hundin.mysql.fi
22269d451a ha_innodb.cc: 
Backport Jan's fix of the LOAD DATA INFILE REPLACE duplicate key error bug (Bug #5835) to 4.0
 2004-11-02 13:21:11 +02:00
monty@mysql.com
9972d68078 merge with 4.0 2004-11-02 08:58:45 +02:00
tomas@poseidon.ndb.mysql.com
1827256ac5 fix call of string::copy() if HAVE_FCONVERT is set 2004-11-01 14:43:53 +00:00
marko@hundin.mysql.fi
a3294186ec mysqld.cc: 
Describe innodb_max_purge_lag
  Improve description of innodb_table_locks
 2004-11-01 12:08:44 +02:00
timour@mysql.com
157dfcf4a4 Minor fixes of the patch for BUG#6303 2004-11-01 10:12:39 +02:00
konstantin@mysql.com
e97a79f2ee Enable REPLACE ... SELECT in prepared statements. 2004-10-30 17:17:52 +04:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
timour@mysql.com
b67f86728b Fix for BUG#6303 + fix for discovered bug with sub-queries when analyzin queries for MIN/MAX optimization (WL#1724). 2004-10-29 18:20:09 +03:00
tomas@poseidon.ndb.mysql.com
dfe8b2ecea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 14:06:57 +00:00
bar@mysql.com
7577c8bfc9 A fix according to Monty's request: 
"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert().
 2004-10-29 17:00:39 +05:00
bar@mysql.com
64c59b37f8 item_strfunc.cc: 
Unnecessary code was removed.
 2004-10-29 16:06:51 +05:00
bar@mysql.com
ea49a5181a Allow to convert to non-Unicode charset when mixing a string 
constant with a column. The string is converted into the column
character set. It conversion doesn't lose data, then operation
is possible. Otherwise, give an error, as it was earlier.
 2004-10-29 16:00:03 +05:00
tomas@poseidon.ndb.mysql.com
da3efc2b82 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 10:24:56 +00:00
tomas@poseidon.ndb.mysql.com
cbeac303c7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 09:49:55 +00:00
tomas@poseidon.ndb.mysql.com
19bc50957f Tru64 cxx compiler fix 
cxx does not include -I/ust/include.dtk as it should
    removed dependency on ndb_types
 2004-10-29 09:49:04 +00:00
hf@deer.(none)
d2bb900612 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6117
 2004-10-29 09:32:32 +05:00
serg@serg.mylan
4375e59901 Merge bk-internal:/home/bk/mysql-5.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2004-10-28 21:22:15 +02:00
bell@sanja.is.com.ua
8894a6bb73 close table before next iteration of table proccesing in mysql_admin_table (to allow open next table) 2004-10-28 21:14:00 +03:00
tomas@poseidon.ndb.mysql.com
2ebdddf2c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-28 15:52:26 +00:00
tomas@poseidon.ndb.mysql.com
289f68a1b9 test that attribute name truncation works 
exposed the attribute name size limit for handler
   added field name truncation to ndb handler
 2004-10-28 15:35:06 +00:00
timour@mysql.com
9161669492 Implementation of WL#1972 "Evaluate HAVING before SELECT select-list" 2004-10-28 17:31:26 +03:00
bar@mysql.com
541883f9d8 Produce a "truncated" warning if a value cannot be converted 
into the column character set on INSERT/UPDATE.
 2004-10-28 15:21:20 +05:00
bell@sanja.is.com.ua
dff05eb951 merge 2004-10-28 11:02:48 +03:00
bar@mysql.com
2fc0d7e422 An extra "separator" class member was removed from Item_func_concat_ws. 
args[0] is now used instead.
 2004-10-28 11:43:31 +05:00
hf@deer.(none)
f4bc2e7f2d Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6117
 2004-10-28 11:38:59 +05:00
konstantin@mysql.com
891a8f5785 Making the latest fix for Bug#6166 (key.test) work in prepared statements. 2004-10-28 02:54:32 +04:00
bell@sanja.is.com.ua
75f7235e8d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
 2004-10-27 23:31:24 +03:00
lenz@mysql.com
6b720d93be - Applied some Windows portability fixes for myisampack.c and sql_handler.cc 
(backports from fixes made in 4.1)
 2004-10-27 21:51:27 +02:00
monty@mysql.com
5b29f59aa8 Fixed access to freed memory 2004-10-27 21:56:17 +03:00
bell@sanja.is.com.ua
9aa2d5f750 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
 2004-10-27 21:17:31 +03:00