mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15126 commits 2781 branches 343 tags 1.6 GiB
Commit graph

3928 commits

Author SHA1 Message Date
serg@serg.mylan
9153fd2ae4 merged 2004-09-03 22:12:27 +02:00
serg@serg.mylan
9b0468bc96 BUG#5327 - mi_sort_index() of 2-level tree 2004-09-03 22:04:08 +02:00
konstantin@mysql.com
bdec2c603b A fix for bug#4368 '"like" fails in PreparedStatement, crashes 
server': the bug occurs when arguments of LIKE function are in 
differentcharacter sets. If these character sets are compatible, 
we create an item-converter. In prepared mode, this item
needs to be created in memory of current prepared statement.
 2004-09-03 23:28:49 +04:00
tomas@poseidon.(none)
73366eafc5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb
 2004-09-03 15:12:34 +00:00
tomas@poseidon.(none)
caf79dacfe renamed ha_recovery_logging to ha_enable_transaction 
added tests to alter table for "large" alter tables and truncates in ndbcluster
added debug printout in restart() in ndbcluster
added flag THD::transaction.on to enable/disable transaction
 2004-09-03 15:11:09 +00:00
ram@gw.mysql.r18.ru
f91ca0bd66 A fix (Bug #4980: union statement with () union () order by produces wrong explain). 2004-09-03 19:59:29 +05:00
ram@gw.mysql.r18.ru
c9d97272ed A fix (Bug #5291: float -> string, truncation, sometimes without warning). 2004-09-03 19:38:16 +05:00
joreland@mysql.com
eff2fa5ee5 Remove usage of row count (as it trashes _all_ explain & table status) 
Use order by
 2004-09-03 14:46:39 +02:00
jan@hundin.mysql.fi
a48db602dd Fixed unique prefix key bug for multibyte character sets (BUG #4521) for 
InnoDB. This fixes also a second part of the same problem with prefix keys
on a multibyte string column for InnoDB.
 2004-09-03 15:26:29 +03:00
igor@rurik.mysql.com
5625988ca3 Merge rurik.mysql.com:/home/igor/mysql-4.0 
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
 2004-09-02 22:07:07 -07:00
igor@rurik.mysql.com
f888026fdc select.result, select.test: 
Added a test case for bug #5333.
null_key.result, key_primary.result:
  Made covering index usable for const tables.
sql_select.cc:
  Made covering index usable for const tables:
  downported the corresponding code from 4.1.
  Simultaneously fixed bug #5333 reported for 4.1.
  The bug was due to the fact that field index in join
  structures was always set to 0 for const tables.
 2004-09-02 22:06:30 -07:00
monty@mysql.com
bb4ccdb177 Remove extra '/' after mysql_real_data_home 
Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
 2004-09-03 02:25:27 +03:00
tomas@poseidon.(none)
1e6925802a fixed wrong initial auto increment value bug#5369 2004-09-02 15:51:44 +00:00
tomas@poseidon.(none)
72083ff6ed see resp file 2004-09-02 15:02:46 +00:00
monty@mysql.com
8547d98c88 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-09-02 16:58:01 +03:00
monty@mysql.com
dec44916c1 After merge fixes 2004-09-02 16:57:26 +03:00
pekka@mysql.com
9683b335e4 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/space/pekka/ndb/version/my41-blobs
 2004-09-02 14:11:47 +02:00
ram@gw.mysql.r18.ru
c6b2b2f09d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
 2004-09-02 16:25:32 +05:00
pekka@mysql.com
f01a88dce9 ha_ndbcluster.cc, ndb_blob.test, ndb_blob.result: 
bug-5013 fix
 2004-09-02 12:42:03 +02:00
bar@mysql.com
f37df2fdcc Bug#4338 mysql-test-run fails if compiled with non-latin1 character set 2004-09-02 12:34:27 +05:00
bell@sanja.is.com.ua
b57e68e6e0 fixed typo in group_concat printing (BUG#5161) 2004-09-01 21:32:24 +03:00
bar@mysql.com
153e18a252 Allow IN to convert arguments into Unicode in some cases. 2004-09-01 15:39:15 +05:00
joreland@mysql.com
e148567003 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-09-01 04:55:16 +02:00
monty@mysql.com
054cea4ca8 Merge with 4.0 2004-09-01 04:12:09 +03:00
monty@mysql.com
ba4d4ce97a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-09-01 02:13:35 +03:00
bell@sanja.is.com.ua
b02451c5bd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-not-4.1
 2004-08-31 21:11:54 +03:00
bell@sanja.is.com.ua
2cf1234ba2 after review patch 2004-08-31 21:10:57 +03:00
mskold@mysql.com
ae801bad8d Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-31 15:53:28 +02:00
monty@mysql.com
7abae83300 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-08-31 16:53:25 +03:00
monty@mysql.com
6adaff23a4 Review of new pushed code (Indentation fixes and simple optimizations) 
Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files
 2004-08-31 14:35:04 +03:00
sergefp@mysql.com
e4ffae2a0e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug-psnames
 2004-08-31 14:12:42 +04:00
mskold@mysql.com
84196617c1 Fix for bug#5312 Ndb Cluster returns wrong error code for duplicate key at insert 2004-08-31 12:07:48 +02:00
mskold@mysql.com
b0bac7d1e0 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-31 10:20:51 +02:00
mskold@mysql.com
4f8a82dbfe Enabled HA_NULL_IN_KEY support 2004-08-31 10:19:10 +02:00
mskold@mysql.com
4b1671c933 Simplified expensive test 2004-08-31 10:00:33 +02:00
serg@serg.mylan
49d49e2fcb Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-30 16:32:10 +02:00
serg@serg.mylan
994d648dda space-stripping in _mi_prefix_search: BUG#5284 2004-08-30 16:12:53 +02:00
lenz@mysql.com
9632f7d9c8 - removed mysql-test/t/flush_block_commit-master.opt as it collided 
with the sleep value we use for the test suite run during the
   release builds
 2004-08-30 09:20:52 +02:00
sergefp@mysql.com
3dfbc35f45 Fix for BUG#5242: Made SQL Syntax Prepared Statement names case-insensitive. 2004-08-29 19:44:28 +04:00
monty@mysql.com
f574cd4e8f Code style fixes. 
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
 2004-08-28 00:49:54 +03:00
joreland@mysql.com
6af42cfba4 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-27 19:36:54 +02:00
joreland@mysql.com
cca01b0191 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 19:02:46 +02:00
bar@mysql.com
b604164599 Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict 2004-08-27 20:48:19 +05:00
bar@mysql.com
e8fcc297e1 grant.result: 
Forgot to push in the previous changeset
 2004-08-27 20:48:18 +05:00
joreland@mysql.com
f33207ac8d Fix order by 2004-08-27 14:15:47 +02:00
joreland@mysql.com
af7c3008db Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-27 14:11:50 +02:00
tomas@poseidon.(none)
698511bfe4 small fixes 2004-08-27 12:11:49 +00:00
joreland@mysql.com
e85ce08901 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 14:02:02 +02:00
ram@gw.mysql.r18.ru
3acccb988a A fix (Bug #5232: CREATE TABLE ... SELECT can deadlock itself). 2004-08-27 16:43:01 +05:00
bar@mysql.com
10b88b37b7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-08-27 15:56:27 +05:00
bar@mysql.com
b10dcf7aa6 grant.result: 
Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.
 2004-08-27 15:55:16 +05:00
joreland@mysql.com
6df66180bd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-27 01:01:47 +02:00
joreland@mysql.com
95e5b457b8 Fix ordered index scan with partially specified key 2004-08-27 00:59:16 +02:00
serg@serg.mylan
acbf96a161 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-26 17:49:16 +02:00
monty@mysql.com
ceba1429b7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-08-26 18:27:33 +03:00
monty@mysql.com
ea687ba5da Portability fixes 
Fixed bug in end space handle for WHERE text_column="constant"
 2004-08-26 18:26:38 +03:00
tomas@poseidon.(none)
50cee6abc8 ndb cluster config fixes, se respective files 2004-08-26 14:35:33 +00:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
ram@gw.mysql.r18.ru
2a29cb0204 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5219
 2004-08-26 16:54:33 +05:00
ram@gw.mysql.r18.ru
2133721ac6 A fix (Bug#5219: Cannot use '||' with MBRContains(..)). 2004-08-26 16:51:26 +05:00
bar@mysql.com
87537752e2 "SELECT BINARY x" now means "SELECT CAST(x AS BINARY)". 2004-08-26 16:31:37 +05:00
rburnett@build.mysql.com
1e0e96a0d2 Test case for Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list 
lowercase_table.result:
  New results for modified lowercase_table test
lowercase_table.test:
  Added test case for all uppercase database when running under lower_case_table_names.  This really only failed under Windows.  Bug# 4792
 2004-08-25 17:25:38 +02:00
tomas@poseidon.(none)
646153819c minor fixes 2004-08-24 23:31:47 +00:00
tomas@poseidon.(none)
c16f134be3 Merge 2004-08-24 22:35:14 +00:00
tomas@poseidon.(none)
0f8dc70610 ndb config ability/naming changes, see respective file 2004-08-24 22:27:33 +00:00
mskold@mysql.com
a2bcb2a558 Cleaned up rnd_init 2004-08-24 23:13:32 +02:00
serg@serg.mylan
1538c318c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-24 22:37:04 +02:00
serg@serg.mylan
19f7592206 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-24 22:37:03 +02:00
tomas@poseidon.(none)
c81df5a0ae Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-clean
 2004-08-24 20:37:03 +00:00
joreland@mysql.com
7a3d0c83fa Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-24 21:07:08 +02:00
konstantin@mysql.com
522a27069f Merge: manual resolve 2004-08-24 23:07:08 +04:00
tomas@poseidon.(none)
0483eb8139 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-clean
 2004-08-24 19:07:08 +00:00
serg@serg.mylan
8f254c1b7b followup 2004-08-24 18:20:27 +02:00
konstantin@mysql.com
ae18dc3ec8 Fix for Bug#5034 "prepared "select 1 into @arg15", second 
execute crashes server": we were deleting lex->result
after each execute, but prepared statements assumed that
it's left intact.
The fix adds cleanup() method to select_result hierarchy,
so that result objects can be reused.
Plus we now need to delete result objects more wisely.
 2004-08-24 20:17:11 +04:00
serg@serg.mylan
8f2d92c56a manually merged 2004-08-24 17:24:23 +02:00
serg@serg.mylan
a302f88eb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-24 17:24:05 +02:00
vva@eagle.mysql.r18.ru
b076665030 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
 2004-08-24 20:18:39 +05:00
tomas@poseidon.(none)
aae0b7ed65 added alias MYSQLD for API 
added choice of : or = in config file
set case insensitive section names
 2004-08-24 14:41:48 +00:00
serg@serg.mylan
50ee43be43 BDB: Bug#4531: unique key prefix interacts poorly with utf8, 
Bug#4594 column index make = failed for gbk
 2004-08-24 15:32:57 +02:00
gluh@gluh.mysql.r18.ru
1786a388e4 Fix for bug #4340: find_in_set is case insensitive even on binary operators(2nd version) 2004-08-24 17:29:08 +04:00
joreland@mysql.com
6163efe1ac merge 2004-08-24 13:29:11 +02:00
hf@deer.(none)
b22a499d42 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-24 16:29:05 +05:00
tomas@poseidon.(none)
c5bf129e9c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-clean
 2004-08-24 11:29:04 +00:00
tomas@poseidon.(none)
5a24844551 some more printouts to SHOW command 2004-08-24 11:28:19 +00:00
hf@deer.(none)
cce03195dc Merging fix 2004-08-24 15:03:44 +05:00
hf@deer.(none)
43a853dd4d Merging 2004-08-24 12:58:21 +05:00
bell@sanja.is.com.ua
9d71f85121 subselect test split on two tests because gis extention can be absent 2004-08-24 10:15:39 +03:00
bell@sanja.is.com.ua
3b65ce7489 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
 2004-08-23 22:32:38 +03:00
bell@sanja.is.com.ua
6fcd27e9cd after review fixes: 
allowed parsing of table fields inside aggregate functions
 added new tests of fields resolving in grouping
 2004-08-23 22:31:01 +03:00
lenz@mysql.com
871625c5d5 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-08-23 21:03:16 +02:00
lenz@mysql.com
0479919884 - removed mysql-test/t/flush_block_commit-master.opt as it collided 
with the sleep value we use for the test suite run during the
   release builds
 2004-08-23 20:58:56 +02:00
tomas@poseidon.(none)
c8d9149ff0 Merge poseidon.(none):/home/tomas/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
 2004-08-23 18:54:29 +00:00
tomas@poseidon.(none)
a1e0046cbf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-23 18:47:37 +00:00
mskold@mysql.com
9ad2448606 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-23 20:33:38 +02:00
tomas@poseidon.(none)
c3f2f7426c further simplifications of ndb config and aligned usage of mysql datadir in ndb 2004-08-23 16:29:04 +00:00
gluh@gluh.mysql.r18.ru
b1847f471c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-08-23 20:18:24 +04:00
gluh@gluh.mysql.r18.ru
7b17daf21e Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree) 2004-08-23 20:17:14 +04:00
vva@eagle.mysql.r18.ru
237615bc53 fixed a Bug #4998 "--protocol doesn't reject bad values" 2004-08-23 20:55:09 +05:00
mskold@mysql.com
c644595dac Fix for bug#5171 2004-08-23 17:24:03 +02:00
guilhem@mysql.com
7bfc78f573 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-08-23 17:16:22 +02:00
gluh@gluh.mysql.r18.ru
7ff0c3978c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
 2004-08-23 19:16:21 +04:00
gluh@gluh.mysql.r18.ru
23535cce16 Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns 
wrong results
 2004-08-23 19:13:47 +04:00
bar@mysql.com
1ffd4d6129 show_check.test, show_check.result: 
Don't do this test for now: it fails on Mac OSX.
 2004-08-23 20:12:40 +05:00
bar@mysql.com
0983295859 Bug#4594: column index make = failed for gbk, but like works 
Fix for HEAP+HASH prefix keys.
 2004-08-23 20:12:39 +05:00
tomas@poseidon.(none)
b8dfb7eaf1 reverted default setting of --ndbcluster if --ndb-connectstring is given 2004-08-23 15:12:38 +00:00
guilhem@mysql.com
252ebd2b30 Fix for BUG#5033 "When using temporary tables truncate does NOT reset the auto_increment counter" 
(ok'd by CTO to fix it in 4.0).
Fix to make mysql-test-run work with all Valgrind versions.
 2004-08-23 16:15:57 +02:00
pem@mysql.com
66a3f65d98 Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0) 2004-08-23 15:29:55 +02:00
bell@sanja.is.com.ua
3ca433e332 merge 2004-08-23 15:50:59 +03:00
sergefp@mysql.com
a309f76128 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
 2004-08-23 13:15:43 +04:00
sergefp@mysql.com
263f2e3fe2 Fix for bug#5088: 
* When executing EXPLAIN, do the same as for the query: convert join type to JT_CONST if keyuse array covers all key parts and all of them are constants.
 * In remove_const, don't remove conditions that depend on some-const-table and current-table.
 2004-08-23 12:31:56 +04:00
bell@sanja.is.com.ua
74d7a092b2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-08-23 10:59:35 +03:00
tomas@poseidon.(none)
05853d95de Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-23 07:33:40 +00:00
serg@serg.mylan
326992430f check for mysql_bin_log.is_open() before my_b_tell(&thd->transaction.trans_log 
in ha_commit_trans - why it didn't crash earlier ?
 2004-08-22 14:23:52 +02:00
serg@serg.mylan
d0afecff15 merged 2004-08-22 12:47:11 +02:00
hf@deer.(none)
6c136f99bf Proposed fix for bug #5003 (subselect with MIN() and LIKE crashes server) 
We have next problem here:
active_index is wrong in the subselect's handler on the second val_int() call.
Optimizer sees that we can use index-read for that kind of condition,
and matching_cond() (sql/opt_sum.cc) doesn't. I suspect, proper solution is
to add appropriate code to the matching_cond() but now just added
missed initialization.
 2004-08-22 00:06:19 +05:00
konstantin@mysql.com
df1d90d12b Fix to skip flush_block_commit test if the server was compiled 
without InnoDB.
 2004-08-21 11:30:41 +04:00
igor@rurik.mysql.com
4b760fcb94 null.test, null.result: 
Added test case for bug #4256.
join_outer.result:
  Fixed bug #4256.
item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.
 2004-08-20 23:48:30 -07:00
igor@rurik.mysql.com
02f9e068b9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 16:32:40 -07:00
konstantin@mysql.com
75454b0a1d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/work/mysql-4.1-4912
 2004-08-21 02:08:20 +04:00
konstantin@mysql.com
568c6e8526 Fix for bug#4912 "mysqld crashs in case a statement is executed 
a second time". The bug was caused by incompatibility of
negations elimination algorithm and PS: during first statement 
execute a subtree with negation was replaced with equivalent 
subtree without NOTs.
The problem was that although this transformation was permanent, 
items of the new subtree were created in execute-local memory.
The patch adds means to check if it is the first execute of a
prepared statement, and if this is the case, to allocate items
in memory of the prepared statement.
The implementation:
- backports Item_arena from 5.0
- adds Item_arena::is_stmt_prepare(), 
  Item_arena::is_first_stmt_execute().
- deletes THD::allocate_temporary_pool_for_ps_preparing(),
  THD::free_temporary_pool_for_ps_preparing(); they
  were redundant.
and adds a few invariants:
- thd->free_list never contains junk (= freed items)
- thd->current_arena is never null. If there is no
  prepared statement, it points at the thd. 
The rest of the patch contains mainly mechanical changes and
cleanups.
 2004-08-21 02:02:46 +04:00
igor@rurik.mysql.com
3862914416 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 14:09:50 -07:00
serg@serg.mylan
949348f576 after merge fix 2004-08-20 22:54:42 +02:00
serg@serg.mylan
f401650290 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-20 22:37:19 +02:00
serg@serg.mylan
050bf6a89f merged 2004-08-20 21:56:29 +02:00
joreland@mysql.com
7a0af351c3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-20 21:55:55 +02:00
igor@rurik.mysql.com
433206c1f2 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-08-20 12:31:57 -07:00
joreland@mysql.com
c7f311c450 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 20:58:55 +02:00
bar@mysql.com
7a27f2ce8c Bug#4594 "column index make = failed for gbk, but like works" 
Fix for MyISAM. Tests for MyISAM and HASH+BTREE.
 2004-08-20 21:29:36 +05:00
joreland@mysql.com
ae522cc19c Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 18:29:36 +02:00
tomas@poseidon.(none)
2aada533d4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-20 16:25:04 +00:00
tomas@poseidon.(none)
91b352377c added switch to mysqld to specify connectstring 2004-08-20 16:10:47 +00:00
dlenev@brandersnatch.localdomain
b4105df897 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
 2004-08-20 19:30:45 +04:00
guilhem@mysql.com
02e93b5758 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-08-20 17:16:03 +02:00
guilhem@mysql.com
5db56a106b Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions, 
in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.
 2004-08-20 16:35:23 +02:00
joreland@mysql.com
f02ebd6fcc bug#5128 - remove need of unique fs-path 
bug#4761 - more validation of hosts
bug#4511 - only non depricated should be saved in config
         - fix ConfigInfo::BOOL w.r.t deprication
 2004-08-20 15:58:30 +02:00
dlenev@brandersnatch.localdomain
c8882165f3 Fix for bug#4302 "ambiguos order by when renamed column is identical to another in result" 
When in find_item_in_list() we are looking for item we should take into account unaliased 
names of the fields but only if item with such aliased name is not found.
Also we should ignore aliases when looking for fully specified field.
 2004-08-20 17:53:46 +04:00
mskold@mysql.com
df72723bfc Added test for fix of bug#5072 2004-08-20 14:44:35 +02:00
hf@deer.(none)
ce65325320 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-08-20 15:39:26 +05:00
hf@deer.(none)
833d285c67 Fix to make range.test work smoothly --without-innidb 2004-08-20 14:29:28 +05:00
mskold@mysql.com
a3c99571a7 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-20 06:53:23 +02:00
mskold@mysql.com
6f8ebb4798 Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-20 06:51:02 +02:00
serg@serg.mylan
62722e7b05 merged 2004-08-20 00:52:43 +02:00
serg@serg.mylan
22546845f2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-19 23:45:44 +02:00
guilhem@mysql.com
0db5b4d202 (manual port from 4.0 - was needed) 
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
 2004-08-19 23:24:35 +02:00
serg@serg.mylan
b81af1c750 less strict assert to take into account weird cases 2004-08-19 23:10:33 +02:00
mskold@mysql.com
ba924c0a40 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-19 21:37:58 +02:00
serg@serg.mylan
68bc1c28a4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-19 18:42:01 +02:00
serg@serg.mylan
a29c9d3707 Bug #4769 - ft in subqueries 2004-08-19 18:40:15 +02:00
bar@mysql.com
d81136e3e1 Bug 4531: unique key prefix interacts poorly with utf8 
Check HEAP+HASH, binary collation
 2004-08-19 16:07:18 +05:00
bar@mysql.com
a7510c70fc Fix trailing spaces behaviour for binary collation. 2004-08-19 15:21:35 +05:00
bar@mysql.com
2496e85b84 Bug#4521: unique key prefix interacts poorly with utf8. 
Fix for binary collations for MyISAM and HEAP BTREE.
This patch also changes trailing spaces behaviour for
binary collations. Binary collations now have PAD 
characteristic too.
 2004-08-19 15:15:10 +05:00
bar@mysql.com
6b90806a4a ctype_utf8.test, ctype_utf8.result: 
Typo fix
 2004-08-19 15:00:55 +05:00
mskold@mysql.com
59c9bcb366 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-19 11:13:49 +02:00
bar@mysql.com
7f92905954 Bug#5081: UCS2 fields are filled with '0x2020' after extending field length 2004-08-19 11:59:33 +05:00
serg@serg.mylan
3f2210c064 after merge fixes 2004-08-19 03:02:09 +02:00
guilhem@mysql.com
6f8f231c35 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-08-19 00:43:48 +02:00
guilhem@mysql.com
42d30b758b Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)": 
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
 2004-08-19 00:29:11 +02:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
mskold@mysql.com
3e1493b84b Fix for WL#1731 Handler: multiple databases 2004-08-18 19:13:39 +02:00
serg@serg.mylan
8ce92878a2 Bug 4937: different date -> string conversion when using 
SELECT ... UNION and INSERT ... SELECT ... UNION
 2004-08-18 14:46:31 +02:00
bar@mysql.com
e0731bad9e func_like.result: 
LIKE crashed mysqld for binary collations in some cases
 2004-08-18 12:11:26 +05:00
sergefp@mysql.com
f60b356f5f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-root
 2004-08-18 02:16:43 +04:00
sergefp@mysql.com
fdb51f67a2 Fix for bug#4488: sign-aware equality check 2004-08-17 02:59:24 +04:00
brian@avenger.(none)
73a3e555be Updated of test cases for CSV engine. 2004-08-16 14:19:50 -07:00
bar@mysql.com
79a3576f7d ctype_utf8.test: 
Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.
 2004-08-16 19:58:50 +05:00
joreland@mysql.com
e51de97ebe Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-15 18:58:02 +02:00
guilhem@mysql.com
4a96a8a64f Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make install'": 
The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
 2004-08-14 15:24:40 +02:00
brian@avenger.(none)
2fb2ee6f8f Adding test cases for the example storage engine (so that you can test to see if it was built correctly). 2004-08-13 17:14:36 -07:00
brian@avenger.(none)
b7b48d6764 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into avenger.(none):/export/brian/tina-4.1
 2004-08-13 16:27:17 -07:00
serg@serg.mylan
68f193f97d Merge 2004-08-13 18:31:30 +02:00
serg@serg.mylan
cd7276689e apply UNIQUE constrain correctly for multi-byte charsets 
only MyISAM is fixed
 2004-08-13 18:29:25 +02:00
bar@mysql.com
1c8b328e16 CSC issue # 3299 fix: 
ENUM and SET type didn't compute their length correctly.
That showed up for example while converting into a CHAR column.
 2004-08-13 19:06:24 +05:00
mskold@mysql.com
40577d587d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-13 14:34:51 +02:00
mskold@mysql.com
7c6b884ef5 Added support for NULL in unique index 2004-08-13 13:51:18 +02:00
bar@mysql.com
8186470b6b ctype_utf8.result, ctype_utf8.test, item_strfunc.cc: 
LEFT() didn't work well in some cases.
 2004-08-13 15:04:10 +05:00
bar@mysql.com
eb5f9437f1 ctype_utf8.result, ctype_utf8.test, mi_key.c: 
bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
 2004-08-13 12:32:27 +05:00
bell@sanja.is.com.ua
0ce931947e skip resolving field in table list if table list is not accessable due to groupping (BUG#4814) 2004-08-13 10:01:30 +03:00
bar@mysql.com
186e6cb2d6 ctype_ucs.result, ctype_ucs.test, item.cc: 
#5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
 2004-08-13 11:13:56 +05:00
brian@avenger.(none)
1fe8b35bba This is the addition of the CSV engine "aka tina". Its an example engine that works as a plain text file. 2004-08-12 20:57:18 -07:00
vva@eagle.mysql.r18.ru
698a88b15d Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
 2004-08-13 02:27:21 +05:00
vva@eagle.mysql.r18.ru
3681594d08 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
 2004-08-13 02:25:50 +05:00
joreland@mysql.com
3fdc2999b7 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-12 20:31:00 +02:00
bar@mysql.com
eb1a82b25d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-08-12 20:43:14 +05:00
bar@mysql.com
fad7a5643a #4521: unique key prefix interacts poorly with utf8 
Fix for MyISAM with prefix compressed keys.
 2004-08-12 20:39:24 +05:00
bell@sanja.is.com.ua
d372284d09 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-08-12 18:38:29 +03:00
vva@eagle.mysql.r18.ru
5406709672 fixed Bug #4358 Problem with HAVING clause that uses alias 
from the select list and TEXT field 

make setup_copy_fields to insert Item_copy_string for blobs in 
the beginning of the copy_funcs (push_back instead of push_front)

the thing is that Item_copy_string::copy for function can call 
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before, 
it's value will be wrong.

So all the Item_copy_string::copy for blobs should be called before 
Item_copy_string::copy for functions.
 2004-08-12 20:37:31 +05:00
bell@sanja.is.com.ua
d7ae5de89b in case of compound index fill all parts in optimized IN (BUG#4435) 2004-08-12 17:31:23 +03:00
ram@gw.mysql.r18.ru
0f0b1ebe62 Added initial sorting in order to make test case repeatable. 2004-08-12 16:16:38 +05:00
guilhem@mysql.com
5332e74a4f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-08-12 13:13:22 +02:00
guilhem@mysql.com
6345dc4fbd Fix for BUG#4678 "mysql-test-run fails on grant_cache": 
do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).
 2004-08-12 13:12:09 +02:00
ram@gw.mysql.r18.ru
a8d3ad5e59 Added initial sorting in order to make test case repeatable. 2004-08-12 16:02:12 +05:00
joreland@mysql.com
a454b977d2 Reenable diskless for faster mysql-test-run 2004-08-12 12:40:35 +02:00
joreland@mysql.com
0991df9656 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-12 12:29:41 +02:00
ram@gw.mysql.r18.ru
494a3b0559 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
 2004-08-12 14:59:33 +05:00
ram@gw.mysql.r18.ru
407bf3c759 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4878
 2004-08-12 14:50:29 +05:00
ram@gw.mysql.r18.ru
955e869d7c A test case (bug #4898: User privileges depending on ORDER BY Settings of table db) 2004-08-12 14:49:16 +05:00
wax@mysql.com
37b46ed217 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
 2004-08-12 14:21:35 +06:00
mskold@mysql.com
b3e1dc445f Added tests for fix of bug#4730 2004-08-12 10:15:53 +02:00
igor@rurik.mysql.com
f2b9c5f491 olap.test, olap.result: 
Added test case for bug #4767.
item_sum.cc:
  Added a correct setting of the maybe_null flag for a copy of 
  an Item_sum object where the argument was a field of an inner table
  in an outer join read from a temporary table.
  It's part of the fix for bug #4767.
sql_select.cc:
  Made change_refs_to_tmp_fields work correctly
  for test case of bug #4767 where Item_sum::get_tmp_table_item
  failed to build a correct copy of an Item_sum object referring
  to a field in a temporary table.
  It looks like a hack yet.
 2004-08-12 00:02:29 -07:00
ram@gw.mysql.r18.ru
74c64904c7 A fix (Bug #4878: Service crashes on query execution) 2004-08-12 11:28:39 +05:00
joreland@mysql.com
c53b138644 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-12 07:46:12 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
259bce85b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411
 2004-08-11 23:26:44 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
bc78a46ac4 Bug#4411 
Fix for server hang bug
 2004-08-11 23:24:36 +01:00
serg@serg.mylan
9a938cc009 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-08-11 23:44:08 +02:00
serg@serg.mylan
6023b58b9f Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow 2004-08-11 23:43:41 +02:00
sergefp@mysql.com
4ddeee9d2f Fix for BUG#4488: first portion: sign aware '<' and '>' comparisons. 2004-08-11 23:08:20 +04:00
bar@mysql.com
a554f7756d ctype_uca.test, ctype_uca.result, ctype-uca.c: 
Slovak collation didn't work: typo fix in the tailoring rules
 2004-08-11 18:06:20 +05:00
lenz@mysql.com
f78ec279e9 - fixed non-predictable floating point results in func_math by adding 
format() around them (as suggested by serg)
 2004-08-11 13:11:59 +02:00
joreland@mysql.com
294958a707 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-11 12:38:11 +02:00
joreland@mysql.com
0e287e536e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-11 12:00:59 +02:00
joreland@mysql.com
525ed9f314 Can't use diskless when memset has been removed 2004-08-11 12:00:35 +02:00
wax@mysql.com
33c976e11a Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
 2004-08-11 15:17:20 +06:00
bar@mysql.com
127cf25c01 ctype_recoding.result, ctype_recoding.test, sql_show.cc: 
Bug#4417: SHOW CREATE TABLE and SHOW COLUMNS now return consistent results when "SET NAMES BINARY", i.e. everything is sent in UTF8: column names, enum values, default values.
 2004-08-11 14:03:24 +05:00
serg@serg.mylan
902518ae48 allow get_format(TIMESTAMP, ...) syntax 2004-08-11 10:27:19 +02:00
joreland@mysql.com
a15b4e5143 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-08-10 17:42:51 +02:00
mskold@mysql.com
0625aef8c0 Bug fix for bug#3912 2004-08-10 14:38:24 +02:00
wax@mysql.com
08acf5ae7e Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1group_concat
 2004-08-10 15:49:58 +06:00
mskold@mysql.com
a5dd9f8bb4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-10 11:48:43 +02:00
wax@kishkin.ru
d3f1a6f0cb BUG#4315 
BUG#4535
BUG#4686
 2004-08-10 15:48:22 +06:00
dlenev@brandersnatch.localdomain
f49d4f5350 Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server". 
Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
or setting of @@time_zone variable we should open and lock them with the rest of 
statement's table (so we should add them to global table list) and after that use such 
pre-opened tables for loading info about time zones.
 2004-08-10 12:42:31 +04:00
dlenev@brandersnatch.localdomain
bcbbfc3bb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4756
 2004-08-10 03:07:07 +04:00
serg@serg.mylan
e1e1c39bda cleanup 2004-08-07 23:18:13 +02:00
dlenev@brandersnatch.localdomain
f325a92b0a Fix for bug #4491 "timestamp(19) doesn't work". 
We should allow 19 as length of newly created TIMESTAMP fields.
 2004-08-06 12:15:40 +04:00
magnus@neptunus.(none)
744af07953 Increase value of TimeBetweenWatchDogCheck to make it to start cluster on lowend machines. 2004-08-06 09:41:44 +02:00
dlenev@brandersnatch.localdomain
1902790634 Fix for bug #4756 "STR_TO_DATE() returning bad results with AM/PM". 
Added support of converion specifiers mentioned in manual but missing in code.
 2004-08-06 10:01:29 +04:00
magnus@neptunus.(none)
d526f3277e BUG#4892 TRUNCATE TABLE returns error 156 
Added NDBCLUSTER to table types which does not support generate. 
Added test case for truncate.
 2004-08-04 11:28:36 +02:00
magnus@neptunus.(none)
1c65da2cbc BUG#4818 DELETE FROM tab LIMIT 
Check if there are any operations pending that needs to be taken over to the updating/deleting transaction before closing the scan
 2004-08-04 10:54:42 +02:00
serg@serg.mylan
dec992d8fb hang in dummy natural join (no common columns) Bug #4807 2004-08-02 11:12:11 +02:00
serg@serg.mylan
c105f1ed8b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-01 16:35:35 +02:00
joreland@mysql.com
29b5faf06f Fix mysql-test-run w.r.t NDB 
"export A=var" is bash feature
instead do "A=var; export A"
 2004-08-01 14:12:45 +02:00
serg@serg.mylan
f4244cd00e bug#4816. index search for NULL in blob 2004-08-01 13:26:01 +02:00
serg@serg.mylan
22ca5582d0 BUG#4393, BUG#4356 - incorrect decimals in fix_length_and_dec() in some functions 2004-07-31 22:39:10 +02:00
mskold@mysql.com
268c1a2edc Bug fix for alter table and auto_increment 2004-07-31 12:00:12 +02:00
serg@serg.mylan
2852862c68 apply in SET PASSWORD same checks as in GRANT, to let only valid hashes through 2004-07-30 22:05:08 +02:00
serg@serg.mylan
f66b4a1be4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 14:25:18 +02:00
serg@serg.mylan
c5e2fbcc53 no_auto_value_on_zero + alter table bug 2004-07-30 14:17:12 +02:00
pem@mysql.comhem.se
f0cd209373 Updated ps_6bdb.results. 2004-07-30 12:13:40 +02:00
serg@serg.mylan
9bbdb794f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 09:50:37 +02:00
serg@serg.mylan
3a17ab4551 auto_value_on_zero bug test 2004-07-30 09:47:56 +02:00
dlenev@brandersnatch.localdomain
789037d901 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492
 2004-07-30 11:01:29 +04:00
guilhem@mysql.com
da55194eb4 rpl_relayrotate.test requires InnoDB (because what we want to test is 
if slave resumes at BEGIN).
 2004-07-30 01:10:21 +02:00
guilhem@mysql.com
2b6151c20f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717
 2004-07-29 23:28:28 +02:00
guilhem@mysql.com
0f3e279a05 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position 
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).
 2004-07-29 23:25:58 +02:00
mskold@mysql.com
f05c7ce7c6 Added test for fix of bug#3912 Auto increment not correctly initialised when table is altered 2004-07-29 14:02:40 +02:00
mskold@mysql.com
24f9a2e9bb Added ORDER BY to ensure same result on all setups/platforms 2004-07-29 13:32:50 +02:00
magnus@neptunus.(none)
10583f05c9 Added order by to make the test output from ndb_basic and ndb_lock predicatble 2004-07-28 10:28:30 +02:00
dlenev@brandersnatch.localdomain
d39fe2623f Fix for bug #4492. 
TIMESTAMP columns should be unsigned to preserve compatibility with 4.0
(Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).

Altough this fix will introduce problems with early 4.1 -> 4.1 upgrades (tables with 
TIMESTAMP field should be reloaded using mysqldump) it will allow easy 4.0 -> 4.1 
upgrade (which is more important since 4.1 is still beta).
 2004-07-28 10:49:21 +04:00
mskold@mysql.com
97d1cf9f3a Merge 2004-07-27 13:02:50 +02:00
magnus@neptunus.(none)
8b9d8b4118 Merge 2004-07-27 11:57:04 +02:00
mskold@mysql.com
894501a1c9 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
 2004-07-27 09:59:26 +02:00