Commit graph

12061 commits

Author SHA1 Message Date
konstantin@mysql.com
57feb6625a Few cleanups to client_test.c 2004-05-06 13:49:20 +04:00
monty@mysql.com
c150453b42 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-06 04:41:09 +03:00
monty@mysql.com
f6dc9169e2 Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
The bug was introduced in a patch in the 4.1.2 source tree.
2004-05-06 04:40:45 +03:00
sergefp@mysql.com
ec33d794d8 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup
2004-05-06 01:06:18 +04:00
bell@sanja.is.com.ua
5030d28035 fixed test results 2004-05-05 23:29:35 +03:00
bell@sanja.is.com.ua
ae85306e19 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 23:19:13 +03:00
guilhem@mysql.com
cd18476e34 Replication:
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
2004-05-05 22:01:41 +02:00
bell@sanja.is.com.ua
26f0825cae merge 2004-05-05 22:30:01 +03:00
monty@mysql.com
4e2b94dea6 After merge fixes 2004-05-05 21:46:16 +03:00
monty@mysql.com
6827fe4086 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-05 21:24:45 +03:00
monty@mysql.com
a5d8b846fa after merge fixes 2004-05-05 21:24:21 +03:00
bell@sanja.is.com.ua
62fca61bc4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 21:24:13 +03:00
bell@sanja.is.com.ua
c5c35c667e caching of queries with isammerge tables forbiden using general way
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
2004-05-05 21:21:41 +03:00
sergefp@mysql.com
7c3376229e Make Item_param::val_int and Item_param::val_str follow the used convention and return 0 if null_value==1. 2004-05-05 20:04:25 +04:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
miguel@hegel.local
4d8235b849 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2004-05-05 10:55:39 -03:00
miguel@hegel.local
634a024fa9 Fixes for prior commit 2004-05-05 10:54:11 -03:00
monty@mysql.com
e51887b050 Portability fix 2004-05-05 14:40:44 +03:00
ram@gw.mysql.r18.ru
949c01bfa2 a fix (Bug #3435: STDDEV|VARIANCE(constant) returns constant if no rows) 2004-05-05 16:06:01 +05:00
monty@mysql.com
104fdf607d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-05 12:40:59 +03:00
monty@mysql.com
82c50dc49d Delete Items created during Prepared Stat (memory leak bug) (Bug #3451) 2004-05-05 12:40:33 +03:00
monty@mysql.com
7e3cf5958c Fixed crashing bug with alter table when table was in use (Bug #3643)
We didn't use 'only index' for tables of type 'const'. (Bug #3497)
2004-05-05 12:31:17 +03:00
marko@hundin.mysql.fi
fc7ae6a222 InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual size
(Bug #3596)
2004-05-05 11:50:58 +03:00
marko@hundin.mysql.fi
09fc359480 InnoDB: os0file.c: Lock files exclusively (Bug #3608) 2004-05-05 11:40:17 +03:00
bell@sanja.is.com.ua
e9492cca05 avoid using ndb tables in query cache 2004-05-05 11:22:10 +03:00
marko@hundin.mysql.fi
10db9f4bea Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-05-05 10:15:43 +03:00
miguel@hegel.local
8d1480f7c5 Windows fixes for VC++ compiler compability 2004-05-05 02:59:17 -03:00
greg@mysql.com
a2a1e43c30 Fixes to Windows project files for 4.0.19 2004-05-04 21:47:39 -01:00
Sinisa@sinisa.nasamreza.org
ee627d2510 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-05-04 23:05:37 +03:00
Sinisa@sinisa.nasamreza.org
68cb444c62 Fix for a multi table updates when one of the tables is not updated
but used in a nested query.
2004-05-04 23:04:05 +03:00
dlenev@brandersnatch.localdomain
f1c8e165a5 After merge fix.
Now test_bug1664() uses new statement checking macros.
2004-05-04 20:02:55 +04:00
dlenev@brandersnatch.localdomain
2c30359aa4 Manual merge of bugfix for Bug #1664. 2004-05-04 19:13:18 +04:00
dlenev@brandersnatch.localdomain
c7fbcbca7a Fix for remaining issues described in Bug #1664
"mysql_send_long_data() API call is completely broken".

Now we are resetting some members (long_data_supplied/null_value...) of Item_param to its 
initial state after each execution of prepared statement. We also manipulating 
Item_param::maybe_null/null_value only via Item_param::set_* setters which makes code a bit 
more robust.
2004-05-04 19:08:19 +04:00
guilhem@mysql.com
5fcd62a13a useless fixes for --report-password and --show-slave-auth-info (almost undocumented options),
just for beauty of truth.
2004-05-04 16:35:31 +02:00
guilhem@mysql.com
8ffa47c0d1 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-04 15:49:22 +02:00
guilhem@mysql.com
a5aeb8f7fa Fix for Bug#3357 "If the statement is long, the error message is trunc and important info is lost";
in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning,
so that it is not cut by truncation if the query is very long (which happens if the query goes first).
2004-05-04 15:48:40 +02:00
Sinisa@sinisa.nasamreza.org
b58127689e union.result:
fixing typo
union.test:
  fixing type
2004-05-04 16:48:34 +03:00
bell@sanja.is.com.ua
af25c817fe Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-prep-4.1
2004-05-04 16:42:39 +03:00
bell@sanja.is.com.ua
c2f194f243 repetable test replaced with inline function 2004-05-04 16:37:04 +03:00
serg@serg.mylan
4fcff3d2f1 don't rely on readdir() returning . and .. first 2004-05-04 14:36:23 +02:00
bell@sanja.is.com.ua
5de8c225e2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-05-04 15:35:11 +03:00
monty@mysql.com
59ddd8c738 Fix to handle unsigned data in prepared statements (Bug #3447)
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
2004-05-04 15:02:38 +03:00
Sinisa@sinisa.nasamreza.org
909d69ff0a union.result, union.test:
a small fix for the test case
2004-05-04 14:11:23 +03:00
joreland@mysql.com
917427f3b7 yangf - yet another ndb gcc/g++ fix
Hopefully last one
2004-05-04 12:40:33 +02:00
joreland@mysql.com
0ee9f5fa19 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-05-04 11:49:21 +02:00
joreland@mysql.com
230134152e Merge NDB patches into 4.1-clone, below is list of changesets
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.1
# Removal of NDBT_Table
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.2
# Removal of NDBT_Table
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.3
# Fix for crashing AT
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1858.1.4
# Bug fixes in testIndex
# --------------------------------------------
# 04/04/13      joreland@mysql.com      1.1866.1.5
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/tmp
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.1.5
# Fix for takeover when accessing indexes.
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1866.1.6
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/tmp
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.1
# Fixed error handling of fire_trigger_ord + lqhkeyref w.r.t indexes
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.2
# Simple retry mechanism in UTIL
# Helps testIndex -n BuildDuring _a lot_
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.3
# Misc fixes to test prg.
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.4
# Allow more retires on application errors
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1858.2.5
# Pass no of rows fetched in SUB_SYNC_CONTINUE_REQ
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1869
# wl1714
# Improve parallellism
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1870
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/wl1714
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1866.1.7
# Merge
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1871
# Merge mysql.com:/home/jonas/src/wl1714
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1872
# Fix for testScan -n ScanReadError5030
# --------------------------------------------
# 04/04/14      joreland@mysql.com      1.1873
# fix testDict -n FragmentType*
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1866.2.1
# small fixes
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1874
# Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into stingray.(none):/space/bk/rep/mysql-4.1-ndb
# --------------------------------------------
# 04/04/14      johan@stingray.(none)   1.1875
# handle rep node as an api node
# --------------------------------------------
# 04/04/14      pekka@mysql.com 1.1873.1.1
# Fix for NDBT_Table removal
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1873.1.2
# Uninitialized var.
# --------------------------------------------
# 04/04/15      johan@stingray.(none)   1.1876
# Merge jandersson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into stingray.(none):/space/bk/rep/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1873.1.3
# Write pid before changing user
# (as runas user probably doesn't have permissions on pid-dir)
# --------------------------------------------
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1862.1.3
# Fix printout of varchars
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1877
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1862.1.4
# Hmm.. don't print attr as many times as length of array
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1878
# Merge mc03.ndb.mysql.com:/space/ndb/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1876.1.1
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      joreland@mysql.com      1.1877.1.1
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/04/15      ndb@mc03.ndb.mysql.com  1.1879
# Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
# into mc03.ndb.mysql.com:/space/ndb/tmp
# --------------------------------------------
# 04/04/17      joreland@mysql.com      1.1880
# LCP bug when restarting ops take's longer than DIH sending a new lcp ord
# Solution:
# Send LCP_FRAG_REP after restarting all ops
# --------------------------------------------
# 04/04/18      joreland@mysql.com      1.1881
# Missspelled ERROR_INSERT
# --------------------------------------------
# 04/04/18      joreland@mysql.com      1.1882
# Added possibility to log only distributed signals
# --------------------------------------------
# 04/04/22      joreland@mysql.com      1.1883
# Removed dependancy to libstdc++
# * pure virtual functions "__cxa_pure_virtual" is defined in libstd++ ->
#   remove all pure virtual functions
# --------------------------------------------
# 04/04/23      joreland@mysql.com      1.1884
# Various minor bug fixes for problems found while compiling
# with icc
# --------------------------------------------
# --------------------------------------------
# 04/04/25      joreland@mysql.com      1.1885
# Removed debug code (joreland:1.1875)
# --------------------------------------------
# 04/04/26      ejonore@mc03.ndb.mysql.com      1.1862.1.5
# Lock pages in memory _after_ daemon-mode (exec/fork)
# --------------------------------------------
# 04/04/27      ejonore@mc03.ndb.mysql.com      1.1862.1.6
# 1) Trap abort()
# 2) StopStart/StopAborted events
# 3) warning if memlock fails
# 4) use g_logger more often (instead of ndbout)
# 
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1886
# bug fix for a bug in wl1714 + software upgrade
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1887
# Cset exclude: joreland@mysql.com|ChangeSet|20040422160720|05374
# --------------------------------------------
# 04/04/27      joreland@mysql.com      1.1888
# removed libstc++ second try...
# --------------------------------------------
# 04/04/28      ejonore@mc03.ndb.mysql.com      1.1862.1.7
# 1) Don't lock FUTURE pages but only current
# 2) Do this when SIZEALT has completed
# --------------------------------------------
# 04/04/30      joreland@mysql.com      1.1889
# Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
# 04/05/03      ndb@mc03.ndb.mysql.com  1.1862.1.8
# Version update
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.3.1
# Changed restart behavior.
# Use "angel" process which monitor "real" process
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.9
# Merge jonas@orca:/home/ndb/releases/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1890
# Merge B2 fixes
# --------------------------------------------
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.10
# Better handling of children terminations
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1862.1.11
# Fixes for angel-restarting
# --------------------------------------------
# 04/05/03      joreland@mysql.com      1.1891
# Merge mysql.com:/home/jonas/src/mysql-4.1-ndb-3.4.x
# into mysql.com:/home/jonas/src/mysql-4.1-ndb
# --------------------------------------------
#
2004-05-04 11:19:19 +02:00
guilhem@mysql.com
6a6d5ef75e trying to remove Windows compiler warnings (Miguel, could you please check if it's better now?) 2004-05-03 23:35:11 +02:00
serg@serg.mylan
8c2ce22e43 compatibility fix. warning removed 2004-05-03 18:26:50 +02:00
serg@serg.mylan
d8ad1eb1c4 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-03 18:23:29 +02:00
Sinisa@sinisa.nasamreza.org
333eadf1b2 Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT 2004-05-03 19:15:26 +03:00