mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25269 commits 2786 branches 343 tags 1.7 GiB
Commit graph

25269 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
4963388cc1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-12 13:57:20 +03:00
monty@mysql.com
4c0d23e156 Fixes during review of new pushed code 
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
 2005-08-12 13:54:42 +03:00
igor@rurik.mysql.com
3f1f7102ca sql_view.cc: 
A safety correction.
 2005-08-12 02:17:27 -07:00
igor@rurik.mysql.com
42810cd07a Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-12 01:33:45 -07:00
igor@rurik.mysql.com
da441e949c sql_base.cc: 
Fixed bug #12470.
  A misplaced initialization of the cond_count counter
  resulted in a wrong calculation of it. This caused a memory
  corruption since this counter was used as a parameter of
  some memory allocation.
view.test:
  Added a test case for bug #12470.
 2005-08-12 01:27:04 -07:00
jimw@mysql.com
898aae5e0f Add SLEEP(seconds) function, which always returns 0 after the given 
number of seconds (which can include microseconds). (Bug #6760)
 2005-08-11 18:58:22 -07:00
jimw@mysql.com
7d1c4bc3c9 Fix which include file is used to decide whether to skip rpl_openssl, the 
earlier change wasn't correct. (But the other changes to the test were.)
 2005-08-11 17:14:11 -07:00
igor@rurik.mysql.com
0aff8a13dc sql_base.cc: 
Fixed bug #12382.
  INSERT statement effectively changed thd->set_query_id to 0,
  while SELECT statement changed it to 0. As a result
  the insert_fields function that expanded '*' was called
  with different values of thd->set_query_id for the query
  SELECT * FROM view depending on whether it was run after
  an INSERT or after a SELECT statement. This was corrected
  by restoring the old value of thd->set_query_id when
  returning from the function setup_fields where possible
  reset could occur.
  If the value of thd->set_query_id == 0 then the fields
  substituted instead of '*' were not registered as used
  for bitmaps used_keys. This caused selection of an invalid
  execution plan for the query SELECT * from <view>.
view.result, view.test:
  Added a test case for bug #12382.
 2005-08-11 16:10:34 -07:00
jimw@mysql.com
03162293da Merge mysql.com:/home/jimw/my/mysql-5.0-12457 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-11 14:35:01 -07:00
jimw@mysql.com
3422ad3a1f Merge mysql.com:/home/jimw/my/mysql-5.0-12324 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-11 12:47:43 -07:00
jimw@mysql.com
d1db84639c Build YASSL libraries with libtool so correct PIC settings are used 
automatically. (Bug #12324)
 2005-08-11 12:26:17 -07:00
vtkachenko@quadxeon.mysql.com
ba8df85719 Merge bk-internal:/home/bk/mysql-5.0 
into quadxeon.mysql.com:/users/vtkachenko/bk/mysql-5.0-tmp
 2005-08-11 20:19:28 +02:00
acurtis@xiphis.org
ee71edd1fe Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/merge-5.0
 2005-08-11 18:44:53 +01:00
acurtis@xiphis.org
597b7412c7 fix after merge 2005-08-11 18:42:22 +01:00
jani@ua141d10.elisa.omakaista.fi
1a7af25913 Fixed some warning and error messages so that they use 
sql_print_warning() and sql_print_error() instead of fprintf to stderr.
Above functions are tuned for different platforms so that the behavior
is consistent around platforms. Using fprintf() different behavior can
be expected at least on Windows and Unix.
 2005-08-11 19:19:20 +03:00
vtkachenko@quadxeon.mysql.com
fc22a36d78 set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h: 
Added innodb_commit_concurrency variable
 2005-08-11 18:03:01 +02:00
monty@mysql.com
e80252e53c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-11 16:43:22 +03:00
monty@mysql.com
7b80e62528 Cleanups during review of new code 2005-08-11 15:58:15 +03:00
acurtis@xiphis.org
b9476f7d50 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1 
into  xiphis.org:/usr/home/antony/work2/merge-5.0
 2005-08-11 12:18:53 +01:00
sanja@arthur.local
3b64651683 query_cache_notembedded.test, query_cache_notembedded.result: 
postmerge fix
 2005-08-11 13:07:08 +03:00
bell@51.0.168.192.in-addr.arpa
4f26fa5184 merge 2005-08-11 10:20:06 +03:00
dlenev@mysql.com
0f75d64734 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11973-2
 2005-08-11 10:39:33 +04:00
bell@51.0.168.192.in-addr.arpa
66a055b4d6 make the same filenames as in 4.1 2005-08-11 09:29:50 +03:00
acurtis@xiphis.org
445bc1336e Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3 
into  xiphis.org:/usr/home/antony/work2/p2-bug10109.4
 2005-08-10 22:17:53 +01:00
sergefp@mysql.com
9125477df5 Merge mysql.com:/home/psergey/mysql-5.0-bug12228-r4 
into mysql.com:/home/psergey/mysql-5.0-bug12228-r5
 2005-08-10 21:17:52 +00:00
sergefp@mysql.com
fbab5fc568 BUG#12228: Post review fixes: Added test case, code cleanup. 2005-08-10 21:17:02 +00:00
jimw@mysql.com
afb43a6397 Fix rpl_openssl test to actually work. (Bug #12457, Bug #10860) 2005-08-10 13:30:53 -07:00
bell@52.0.168.192.in-addr.arpa
1dff783854 block using QC in case of having tables locked by LOCK... (BUG#12385) 2005-08-10 18:58:55 +03:00
konstantin@mysql.com
8392a814af A fix and a test case for Bug#12243 "MySQL Server crashes with 2 
cursors (+ commit)" and Bug#11832 "Server crash with InnoDB + Cursors"
See comments to the changed files.
 2005-08-10 18:36:13 +04:00
konstantin@mysql.com
cacc1a9f0a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kostja/mysql/mysql-5.0-12243
 2005-08-10 17:47:10 +04:00
konstantin@mysql.com
3a73ef8a86 Fix coding style. 2005-08-10 17:45:42 +04:00
reggie@linux.site
3e964a18d2 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  linux.site:/home/reggie/bk/mysql-5.0-new
 2005-08-10 05:02:37 -06:00
hf@deer.(none)
88b01808d9 error message fixed 2005-08-10 16:02:36 +05:00
mskold@mysql.com
8439de17ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-10 10:43:17 +02:00
konstantin@mysql.com
f6306a8db1 A fix for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY join in 
subqry order by server crash": failing DBUG_ASSERT(curr_join == this)
when opening a cursor.
Ensure that for top-level join curr_join == join (always), 
and thus fix the failing assert.
curr_join is a hack to ensure that uncacheable subqueries can be
re-evaluated safely, and should be never different from main join
in case of top-level join.
 2005-08-10 12:25:26 +04:00
mskold@mysql.com
978d67a9ea Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-08-10 09:52:58 +02:00
mskold@mysql.com
eeecb84050 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-10 09:45:05 +02:00
mskold@mysql.com
7ccf9b9708 Added support for ha_ndbcluster::info(HA_STATUS_AUTO) 2005-08-10 09:38:36 +02:00
dlenev@mysql.com
ec5ceecab7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12280
 2005-08-10 10:32:43 +04:00
dlenev@mysql.com
51537c057d Fix for bug #12280 "Triggers: crash if flush tables". 
We should not allow FLUSH statement to be executed inside both triggers
and stored functions.
 2005-08-10 10:31:32 +04:00
dlenev@mysql.com
60511c3df2 Clumsy but working fix for bug #11973 "SELECT .. INTO var_name; in trigger 
cause crash on update".

Let us update "thd" pointer in LEX, all its units and in LEX::result before
executing statement in trigger body, since triggers are associated with TABLE
object and because of this can be used in different threads.
 2005-08-10 00:23:56 +04:00
evgen@moonbone.local
5e65456cc0 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-12340
 2005-08-10 00:19:23 +04:00
reggie@monster.
c63ebf9409 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  monster.:D:/Work/mysql/mysql-5.0
 2005-08-09 14:50:54 -05:00
reggie@monster.
03060be40f Some changes to project files 
str_alloc had been added but was not added to mysqlclient and strings
libmysql should have had strings as a dependent.
 2005-08-09 14:48:43 -05:00
evgen@moonbone.local
2a025ffbeb Fix bug #12340 Wrong comparison in ha_innobase::cmp_ref() 
When PRIMARY KEY is present ha_innobase::cmp_ref() uses it to compare refs.
After comparing part of key it moves pointers to compare next part.
For varchar parts pointers were moved only by length of parts, not including
bytes containig part length itself. This results in wrong comparision and
wrong number of deleted records.
 2005-08-09 22:05:07 +04:00
acurtis@xiphis.org
aa99bd61c0 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  xiphis.org:/usr/home/antony/work2/p2-bug10109.3
 2005-08-09 16:35:51 +01:00
reggie@linux.site
153ad3f687 changes to IM code that came from Petr's review 2005-08-09 07:57:40 -06:00
reggie@linux.site
88ebfb5bc6 removing trailing spaces 2005-08-09 07:57:39 -06:00
reggie@linux.site
7fa1779d62 fixed assignments to meet server coding guidelines 2005-08-09 07:57:38 -06:00
reggie@linux.site
2a00611f9c changes to IM that came from Petr and JimW's review. 2005-08-09 07:57:37 -06:00