Commit graph

292 commits

Author SHA1 Message Date
igor@rurik.mysql.com
40193a7fa5 Manual merge 2003-08-26 00:13:22 -07:00
bell@laptop.sanja.is.com.ua
dd9cbce47b merge 2003-08-19 20:14:35 +03:00
monty@mashka.mysql.fi
eb6458cb18 After merge fixes + bugs from last merge 2003-08-19 16:00:12 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
bell@sanja.is.com.ua
a0fda66f00 merge 2003-08-11 11:51:33 +03:00
igor@rurik.mysql.com
994a1ea337 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-09 12:57:39 -07:00
Sinisa@sinisa.nasamreza.org
1d2a7cadae merge 2003-08-06 18:59:26 +03:00
igor@rurik.mysql.com
f7adcbff7b Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-02 03:27:13 -07:00
igor@rurik.mysql.com
9306f55d8e Many files:
Added key cache assignment
mi_locking.c:
  Added key cache assignment: correction
my_sys.h:
  Added key cache variable structure
2003-08-02 02:43:18 -07:00
bell@sanja.is.com.ua
62eaaf22f3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
2003-07-29 20:26:14 +03:00
vva@eagle.mysql.r18.ru
8b52d7b6c4 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
2003-07-28 10:58:50 -04:00
vva@eagle.mysql.r18.ru
406b8ba21e changed for AUTO_VALUE_ON_ZERO 2003-07-28 10:57:46 -04:00
serg@serg.mylan
e0d9c9cd2b Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-27 09:59:24 +02:00
vva@eagle.mysql.r18.ru
f32299279d fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump) 2003-07-22 18:58:30 -04:00
serg@serg.mylan
2cac8f0768 now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
Sinisa@sinisa.nasamreza.org
1167e170d2 Merge 2003-07-19 18:49:04 +03:00
monty@mashka.mysql.fi
e1aa90a9bf Safety and speedup fixes:
Changed is_open() to work as before.
Added back inited argument to LOG
2003-07-14 10:12:05 +03:00
guilhem@mysql.com
fbebac9a48 Fix for BUG#791:
a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.
2003-07-11 14:26:44 +02:00
bell@sanja.is.com.ua
5eaaf8e732 after review changes (SCRUM)
removed outer resolving flag (because of movingtransformation after fix_fields)
2003-07-02 01:45:22 +03:00
bell@sanja.is.com.ua
2d120d32fa cond_count moved to SELECT_LEX_NODE
fixed BUG #726
2003-06-26 11:09:11 +03:00
monty@mashka.mysql.fi
7655f05dc2 LEFT JOIN optimization: Change LEFT JOIN to normal join if possible 2003-06-26 05:38:19 +03:00
Sinisa@sinisa.nasamreza.org
862506b6af Derived tables bug fix ....... 2003-06-12 16:52:36 +03:00
igor@rurik.mysql.com
a0f3dcc3c8 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f547f2769f Many files:
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.
2003-06-12 04:29:02 -07:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
bar@bar.mysql.r18.ru
81f0fb6e18 character_set_server is now updatable
character_set_database was added
Code optimization: reuse more code for all character sets variables
2003-05-30 13:03:56 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
13530887cb Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398)
2003-05-13 18:58:26 +03:00
monty@mashka.mysql.fi
60dfb25be3 Give warning if MySQL doesn't honor given storage engine
Allow syntax CREATE TABLE t1 (LIKE t2)
2003-05-13 11:15:11 +03:00
monty@mashka.mysql.fi
b3bab6aa73 merge with 3.23 2003-05-08 00:41:46 +03:00
monty@mashka.mysql.fi
8a28428c0a Better grant test for SELECT * 2003-05-08 00:34:23 +03:00
monty@mashka.mysql.fi
5d5d5b08ac Merge to get security patch 2003-05-08 00:12:46 +03:00
monty@mashka.mysql.fi
71ce598fa2 Security patch to remove wrong error when one had a global update/delete privilige and a database specific SELECT privilege. 2003-05-07 23:59:24 +03:00
monty@narttu.mysql.fi
7410b6cbdf Fix problem where key_read was not cleaned up properly, which caused assert in innodb test. 2003-05-03 16:21:43 +03:00
Sinisa@sinisa.nasamreza.org
0ed1cbbd48 Porting back security fix from 4.0.
All tests plus grant.pl test passed.
2003-04-29 18:24:33 +03:00
monty@mashka.mysql.fi
51eed4b48c Fix for openssl on Solaris
Fix for grant bug with SELECT *
2003-04-28 10:32:56 +03:00
igor@hundin.mysql.fi
517a287ec9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
2003-04-24 18:42:06 +03:00
igor@hundin.mysql.fi
80615fade2 Many files:
Added the MAX_LENGTH_FOR_SORT_DATA option
filesort.cc:
  Added the MAX_LENGTH_FOR_SORT_DATA option
2003-04-24 14:33:33 +03:00
bar@bar.mysql.r18.ru
58f08024e7 sql_base.cc:
Table name cache is case-sensitive now like in 4.0.
2003-04-22 19:01:24 +05:00
monty@narttu.mysql.fi
48a9c1239c Added support for ULONG division with DIV
Fixed non fatal memory leak in slave code.
2003-03-19 21:23:13 +02:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
serg@serg.mysql.com
f590fa7ce2 merged 2003-03-13 17:57:24 +01:00
monty@mashka.mysql.fi
6c81552dd3 Better fix for GRANT bug 2003-03-13 16:43:43 +02:00
serg@serg.mysql.com
026ec1d37c merged 2003-03-13 13:44:03 +01:00
Sinisa@sinisa.nasamreza.org
d87036511b Fix for a bug with column privileges ... 2003-03-12 17:08:48 +02:00
bar@bar.mysql.r18.ru
391b3ec636 item_func.cc, item_cmpfunc.cc, unireg.cc, table.cc, sql_base.cc:
some default_charset_info were removed
2003-03-07 13:39:53 +04:00
monty@narttu.mysql.fi
2a7dfa172c Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped 2003-03-04 12:22:35 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
48558055ed Move tmp_table_used to THD
Optimize depending sub querys
Remove valgrind warnings
2003-02-10 17:59:16 +02:00