mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34607 commits 2781 branches 343 tags 1.6 GiB
Commit graph

34607 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@kahlann.erinye.com
9fe01abcca Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-31 18:54:15 +01:00
df@kahlann.erinye.com
beb265b2fe MTR_BUILD_THREAD=auto for test runs during RPM build 2007-01-31 18:18:44 +01:00
joerg@trift2.
f1289aa1d9 Merge trift2.:/MySQL/M50/bug23293-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-31 18:18:11 +01:00
joerg@trift2.
cd16ad87a2 Merge trift2.:/MySQL/M50/bug12676-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-31 18:16:51 +01:00
joerg@trift2.
e56eb2288c Fix bug#23293 "readline detection broken on NetBSD": 
Its root cause is a difference between the "readline" and "libedit" (header files)
definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
This variable is used as a pointer to a function returning "char *",
but "libedit" declares it as returning "int" and then adds casts on usage.

Change it to "CPFunction *" and get rid of the casts.
 2007-01-31 15:25:56 +01:00
kent@mysql.com/kent-amd64.(none)
e580bd6c6f gen_lex_hash.cc: 
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
  Removed C version of mysql-test-run
mysql.spec.sh:
  Specify GPL license only in GPL sources
.del-my_manage.h:
  Delete: mysql-test/my_manage.h
mysql.spec.sh:
  Added GPL header
.del-mysql_test_run_new.c:
  Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
  Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
  Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
  Delete: mysql-test/my_manage.c
 2007-01-31 00:06:42 +01:00
df@kahlann.erinye.com
95275e28f2 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-25530
 2007-01-30 13:57:36 +01:00
gluh@mysql.com/eagle.(none)
45f61a06fb Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2007-01-26 16:36:50 +04:00
joerg@trift2.
32e83a6c3d For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide 
additional files that specify some actions which are allowed to the MySQL binaries.
    
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.

This fixes bug#12676.
 2007-01-25 17:51:21 +01:00
dlenev@mockturtle.local
8b69d169d4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
 2007-01-25 11:26:18 +03:00
df@kahlann.erinye.com
fdd8410e59 BUG#25530 --with-readline fails with commercial source packages 2007-01-25 08:46:07 +01:00
sergefp@mysql.com
4908cf0772 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
 2007-01-25 02:28:53 +03:00
sergefp@mysql.com
39e6de4359 BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...): 
Fixed typo problem that surfaced after the merge
 2007-01-25 02:27:28 +03:00
svoj@mysql.com/april.(none)
de1572d687 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-01-25 01:31:58 +04:00
svoj@mysql.com/april.(none)
ea7fe60fbc Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-01-25 01:26:57 +04:00
sergefp@mysql.com
cced625508 BUG#24127: merge fixes: If subselect is a union, dont allocate several 
identical pushed_cond_guards arrays. Allocate only one always.
 2007-01-24 22:23:50 +03:00
dlenev@mockturtle.local
37110aad7f Disabling back im_daemon_life_cycle.test, which was temporarily enabled in 
the team tree for additional investigation.
 2007-01-24 22:11:27 +03:00
dlenev@mockturtle.local
c762789096 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
 2007-01-24 19:33:06 +03:00
sergefp@mysql.com
e2f0f4dbd3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
 2007-01-24 19:13:28 +03:00
gluh@mysql.com/eagle.(none)
a7acea61de Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-01-24 19:24:16 +04:00
istruewing@chilla.local
0dc064536f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-24 15:52:19 +01:00
istruewing@chilla.local
23debf8662 Bug#24607 - MyISAM pointer size determined incorrectly 
After merge fix
 2007-01-24 13:29:46 +01:00
istruewing@chilla.local
050ddb2032 Merge chilla.local:/home/mydev/mysql-4.1-bug24607 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-24 13:26:06 +01:00
istruewing@chilla.local
928d672c46 Bug#24607 - MyISAM pointer size determined incorrectly 
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
 2007-01-24 13:17:01 +01:00
df@kahlann.erinye.com
cb6c5f7ee7 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-24 09:24:52 +01:00
svoj@mysql.com/june.mysql.com
0e5aa80e8a After merge fix. 2007-01-24 11:53:09 +04:00
svoj@mysql.com/june.mysql.com
603dcb4d3f Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
 2007-01-24 11:41:13 +04:00
svoj@mysql.com/june.mysql.com
94d834c7b6 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
 2007-01-24 11:40:45 +04:00
svoj@mysql.com/june.mysql.com
02212e6ace Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
 2007-01-24 11:38:23 +04:00
stewart@willster.(none)
b0d94e9d35 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
 2007-01-24 16:24:21 +11:00
stewart@willster.(none)
4889ea2321 fix hpux build problem and some ndb connect errors being missed 2007-01-24 16:12:39 +11:00
tomas@poseidon.mysql.com
f869a0d605 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-01-24 09:13:47 +07:00
igor@olga.mysql.com
459f3cf18a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-01-23 17:04:01 -08:00
istruewing@chilla.local
26153490ec Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug24607
 2007-01-23 22:27:03 +01:00
istruewing@chilla.local
b381fd87bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-23 20:19:19 +01:00
igor@olga.mysql.com
20279c1a7b Post-merge fix. 2007-01-23 10:11:53 -08:00
igor@olga.mysql.com
ed3c1741d4 Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-01-23 09:56:06 -08:00
pekka@clam.ndb.mysql.com/clam.(none)
d3462b9af1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
 2007-01-23 15:20:50 +01:00
stewart@willster.(none)
a1a7816161 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
 2007-01-24 00:44:11 +11:00
dlenev@mockturtle.local
6562df201a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491
 2007-01-23 15:57:46 +03:00
svoj@mysql.com/june.mysql.com
fb2172d20b Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
 2007-01-23 16:35:17 +04:00
dlenev@mockturtle.local
2b63f10601 Proposed fix for bug#24491 "using alias from source table in insert ... 
on duplicate key".

INSERT ... SELECT ... ON DUPLICATE KEY UPDATE which was used in
stored routine or as prepared statement and which in its ON DUPLICATE
KEY clause erroneously tried to assign value to a column mentioned only
in its SELECT part was properly emitting error on the first execution
but succeeded on the second and following executions.

Code which is responsible for name resolution of fields mentioned in
UPDATE clause (e.g. see select_insert::prepare()) modifies table list
and Name_resolution_context used in this process. It uses
Name_resolution_context_state::save_state/restore_state() to revert
these modifications. Unfortunately those two methods failed to revert
properly modifications to TABLE_LIST::next_name_resolution_table
and this broke name resolution process for successive executions.

This patch fixes Name_resolution_context_state::save_state/restore_state()
in such way that it properly handles TABLE_LIST::next_name_resolution_table.
 2007-01-23 15:03:48 +03:00
pekka@clam.ndb.mysql.com/clam.(none)
56e2d4ffcb ndb - bug#25562 use byte-size max_data_length() when setting blob part size 2007-01-23 12:58:10 +01:00
gluh@mysql.com/eagle.(none)
e34b0056f2 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-01-23 14:08:58 +04:00
stewart@willster.(none)
5b886fa358 round up Transporter connect timeout 2007-01-23 17:19:27 +11:00
stewart@willster.(none)
4984af30ec Bug #25487 deleting ndb_cluster_connection object takes long time 
aim is to:
  a) if set_connect_timeout called, timeout connect attempt (for retry on
  next call) after timeout period
  b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
  
  Related to customer issue with long time deleting ndb_cluster_connection
  object. believe we're hanging on the connect(2) call until timeout (when
  we then realise we should exit the thread).
 2007-01-23 17:07:09 +11:00
tomas@poseidon.mysql.com
6825593df8 ndb - bug#22013 
Fix bug in event handling wrt early node shutdown
 2007-01-23 11:44:42 +07:00
tomas@poseidon.mysql.com
12911bb5c0 bug#25746 ndb: 4209 error with 2 VARCHAR primary keys 
- post review changes
 2007-01-23 07:12:03 +07:00
igor@olga.mysql.com
9659c11b6e Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches. 
The bug is actually a duplicate of the bug 14708.
Down-ported the fix for 14708 from 5.0.  
Merged the test case for bug 14708 from 5.0.
 2007-01-22 14:23:53 -08:00
evgen@moonbone.local
884713fb08 sql_select.cc: 
Code cleanup after fix for bug#23417.
 2007-01-22 23:04:14 +03:00