Commit graph

34981 commits

Author SHA1 Message Date
df@pippilotta.erinye.com
677ca6bb5b fix shell script 2007-03-21 15:49:51 +01:00
df@pippilotta.erinye.com
1b84cb44b3 Modify BUG#26701 patch and a different location to also use the correct arguments for GCC 5 and 6. 2007-03-19 16:15:47 +01:00
df@pippilotta.erinye.com
2658b0853b BUG#26701 check-cpu compile flags in x86-64 doesn't support gcc < 3.4,
apply suggestion from jocelyn fournier
2007-03-01 20:58:51 +01:00
kent@mysql.com/kent-amd64.(none)
47efc7527d Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-02-28 22:33:29 +01:00
kent@mysql.com/kent-amd64.(none)
904972ceee Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 22:31:58 +01:00
kent@mysql.com/kent-amd64.(none)
4bddd1f6ca Makefile.am:
EXCEPTIONS-CLIENT is now static part of repository
2007-02-28 22:30:50 +01:00
kent@mysql.com/kent-amd64.(none)
de51325735 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-02-28 22:14:45 +01:00
kent@mysql.com/kent-amd64.(none)
444072f299 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 22:13:35 +01:00
kent@mysql.com/kent-amd64.(none)
f471a67fa6 Makefile.am:
EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
2007-02-28 22:09:09 +01:00
kent@mysql.com/kent-amd64.(none)
9a48ef3a06 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-02-28 21:20:57 +01:00
kent@mysql.com/kent-amd64.(none)
1fad124e01 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 21:19:19 +01:00
joerg@trift2.
d297fe2680 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-02-28 11:24:34 +01:00
joerg@trift2.
ea2261d1a1 A binary package should also contain the "mysqld-debug" server (backport from 5.1). 2007-02-28 11:23:00 +01:00
gluh@mysql.com/eagle.(none)
b3cb846680 removed unused variable 2007-02-27 12:37:17 +04:00
gluh@mysql.com/eagle.(none)
e8635ad3cb Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-26 16:57:45 +04:00
knielsen@ymer.(none)
01ea1aa44d Compiler warning suppression fix: Add missing file to 'make dist'. 2007-02-26 08:11:10 +01:00
evgen@sunlight.local
d9831e91a1 item.cc, item.h:
Post fix for bug#23800.
2007-02-26 09:01:43 +03:00
evgen@sunlight.local
e91347dd49 item.h:
Post fix for bug#23800.
  Copy the table name of an Item_outer_ref to the conventional memory.
2007-02-25 23:02:11 +03:00
evgen@moonbone.local
b617c36979 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/23800-bug1-5.0-opt-mysql
2007-02-24 23:04:47 +03:00
evgen@moonbone.local
47ffb61fb0 item.cc:
Post fix for bug#23800.
  The Item_field constructor now increases the select_n_where_fields counter.
sql_yacc.yy:
  Post fix for bug#23800.
  Take into account fields that might be added by subselects.
sql_lex.h:
  Post fix for bug#23800.
  Added the select_n_where_fields variable to the st_select_lex class.
sql_lex.cc:
  Post fix for bug#23800.
  Initialization of the select_n_where_fields variable.
2007-02-24 23:04:15 +03:00
monty@mysql.com/hasky.mysql.fi
0ad4aa88c1 Merge monty@192.168.0.9:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-02-22 20:34:00 +02:00
monty@mysql.com/narttu.mysql.fi
8f4fef291d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-02-22 20:32:19 +02:00
monty@mysql.com/hasky.mysql.fi
8abc998af6 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into  mysql.com:/home/my/mysql-5.0
2007-02-22 20:25:13 +02:00
monty@mysql.com/narttu.mysql.fi
510c1238ac Portability fix
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
2007-02-22 20:20:49 +02:00
monty@mysql.com/hasky.mysql.fi
38b22db337 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into  mysql.com:/home/my/mysql-5.0
2007-02-22 17:03:05 +02:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33 Fixed compiler warnings (for linux and win32 and win64)
Fixed a couple of usage of not initialized warnings (unlikely cases)
2007-02-22 16:59:57 +02:00
mhansson@dl145s.mysql.com
bcf1596d8b Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.0o-bug24010
2007-02-22 14:29:00 +01:00
mhansson/martin@linux-st28.site
340ab21795 Bug #24010: INSERT INTO ... SELECT fails on unique constraint with data
it doesn't select.

This bug was fixed along with bug #16861: User defined variable can 
have a wrong value if a tmp table was used.

There the fix consisted of Item_func_set_user_var overloading the method
Item::save_in_field. Consider the query from the test case:


INSERT INTO foo( bar, baz )
SELECT 
  bar,
  @newBaz := 1 + baz
FROM 
  foo
WHERE 
  quux <= 0.1;

Here the assignment expression '@newBaz := 1 + baz' is represented by an 
Item_func_set_user_var. Its member method save_in_field, which writes the 
value of this assignment into the result field, writes the val_xxx() value, 
which is not updated at this point. In the fix introduced by the patch,
the save_in_field method reads the actual variable value instead.

See also comment for 
ChangeSet@1.2368.1.3, 2007-01-09 23:24:56+03:00, evgen@moonbone.local +4 -0
and comment for
Item_func_set_user_var::save_in_field (item_func.cc)
2007-02-22 14:11:01 +01:00
joerg@trift2.
929bdae377 Merge trift2.:/MySQL/M40/clone-4.0
into  trift2.:/MySQL/M40/mysql-4.0
2007-02-22 11:16:42 +01:00
evgen@moonbone.local
76461a4442 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/23800-bug1-5.0-opt-mysql
2007-02-21 23:18:17 +03:00
evgen@moonbone.local
9a233742b8 Bug#23800: Outer fields in correlated subqueries is used in a temporary table
created for sorting.

Any outer reference in a subquery was represented by an Item_field object.
If the outer select employs a temporary table all such fields should be
replaced with fields from that temporary table in order to point to the 
actual data. This replacement wasn't done and that resulted in a wrong
subquery evaluation and a wrong result of the whole query.

Now any outer field is represented by two objects - Item_field placed in the
outer select and Item_outer_ref in the subquery. Item_field object is
processed as a normal field and the reference to it is saved in the
ref_pointer_array. Thus the Item_outer_ref is always references the correct
field. The original field is substituted for a reference in the
Item_field::fix_outer_field() function.

New function called fix_inner_refs() is added to fix fields referenced from
inner selects and to fix references (Item_ref objects) to these fields.

The new Item_outer_ref class is a descendant of the Item_direct_ref class.
It additionally stores a reference to the original field and designed to
behave more like a field.
2007-02-21 23:00:32 +03:00
monty@mysql.com/hasky.mysql.fi
c55337e81b Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-02-21 19:41:50 +02:00
monty@mysql.com/narttu.mysql.fi
6946fa682f After merge fixes
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
2007-02-21 19:38:40 +02:00
joerg@trift2.
683a478669 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-02-21 16:21:12 +01:00
tomas@poseidon.mysql.com
9cae1fd7ee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.mysql.com:/home/tomas/mysql-5.0
2007-02-21 21:50:43 +07:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02:00
monty@mysql.com/narttu.mysql.fi
222e128b34 Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
2007-02-21 13:02:57 +02:00
tomas@poseidon.mysql.com
7e9ec9a1f0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-02-21 14:00:28 +07:00
joerg@trift2.
4cb11ae425 Merge trift2.:/MySQL/M41/merge-4.1
into  trift2.:/MySQL/M50/merge-5.0
2007-02-20 20:18:29 +01:00
istruewing@bk-internal.mysql.com
37cedb7efa Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-engines
2007-02-20 18:53:41 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
724a3b33ee Raise version number after cloning 5.0.36 2007-02-20 16:50:54 +01:00
joerg@trift2.
74fed0c305 After-merge fix:
The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".
2007-02-20 13:10:27 +01:00
joerg@trift2.
0daf91a62a Merge trift2.:/MySQL/M40/clone-4.0
into  trift2.:/MySQL/M41/merge-4.1
2007-02-20 13:02:39 +01:00
istruewing@chilla.local
0f4a84f002 Fixed a bad merge. Got a duplicate symbol on OSX. 2007-02-20 10:01:54 +01:00
jonas@perch.ndb.mysql.com
a7aed14bc9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-02-20 01:05:11 +01:00
jonas@perch.ndb.mysql.com
8801e8e7af fix compile error in testBitfield 2007-02-20 00:55:33 +01:00
jonas@perch.ndb.mysql.com
b4b35f9603 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-02-19 22:58:35 +01:00
jonas@perch.ndb.mysql.com
a51d58e641 ndb - fix correct argv/argc handling in testBitfield 2007-02-19 22:51:04 +01:00
jonas@perch.ndb.mysql.com
2ec6d9e2db Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-02-19 22:32:24 +01:00
jonas@perch.ndb.mysql.com
f0253235b8 ndb -
forgott to add testcase for bug#26481
2007-02-19 22:30:54 +01:00