Commit graph

32444 commits

Author SHA1 Message Date
igor@rurik.mysql.com
cfb63c4b74 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-03-30 15:45:48 -08:00
kent@mysql.com
ac34c93bc2 Merge 2006-03-30 23:52:54 +02:00
igor@rurik.mysql.com
4cdda34fd3 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-30 13:34:14 -08:00
kent@mysql.com
ece5ef1551 Merge 2006-03-30 22:10:48 +02:00
konstantin@mysql.com
3ec14cd1d6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 23:20:09 +04:00
konstantin@mysql.com
08eff11273 Merge mysql.com:/opt/local/work/tmp_merge2
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 19:12:10 +04:00
konstantin@mysql.com
365c7aea3a Merge mysql.com:/opt/local/work/tmp_merge1
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 19:01:36 +04:00
konstantin@mysql.com
5c99b8b83f Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 18:43:42 +04:00
hakan@lu0008.wdf.sap.corp
9b9ebd83eb Hakan Kuecuekyilmaz 2006-03-30 15:54:32 +02:00
petr@mysql.com
0250c0115d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-30 16:32:53 +04:00
petr@mysql.com
5d448351f2 fix csv test failure on non-linux platforms 2006-03-30 16:30:30 +04:00
knielsen@mysql.com
da000b2d2a Fix AIX compile failure. 2006-03-30 11:12:24 +02:00
knielsen@mysql.com
ce4463a139 Add some stuff to source package needed for CMake Windows packaging. 2006-03-30 11:02:52 +02:00
kent@mysql.com
59a30d07bf btr0sea.c:
Added BTR_CHUNK_SIZE, removed 'chunk_size' declared after declaration block
2006-03-30 08:10:03 +02:00
kent@mysql.com
46d0edb8cc 2006-03-30 06:53:39 +02:00
monty@mysql.com
2b1f521286 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-30 06:11:34 +03:00
igor@rurik.mysql.com
0440cc75bd Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-29 17:54:01 -08:00
acurtis@xiphis.org
6cbd57914a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  xiphis.org:/home/antony/work2/p1-bug18464
2006-03-29 17:31:59 -08:00
igor@rurik.mysql.com
0f9ab67d41 Fixed bug : crash in the cases when on conditions are moved
out of a nested join to the on conditions for the nest.
The bug happened due to:
1. The function simplify_joins could change on expressions for nested joins.
   Yet modified on expressions were not saved in prep_on_expr.
2. On expressions were not restored for nested joins in 
   reinit_stmt_before_use.
2006-03-29 16:45:29 -08:00
monty@mysql.com
98052743ff Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-30 01:21:48 +03:00
mskold@mysql.com
8d1e56e686 Fix for bug#18598 ndb_partition_list 2006-03-29 23:48:35 +02:00
monty@mysql.com
c9a7865193 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-30 00:48:35 +03:00
aivanov@mysql.com
70f8b397c5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/mysql-5.1-new
2006-03-30 01:48:34 +04:00
aivanov@mysql.com
02ed56ee1c Null-merge 2006-03-30 00:57:27 +04:00
kent@mysql.com
3a0d957f8a Makefile.am:
Use "dist_bin_SCRIPTS" to get a script distributed
2006-03-29 22:51:49 +02:00
bpontz@mysql.com
c1ac02a424 configure.in:
Increased version number because of clone-off
2006-03-29 22:20:16 +02:00
konstantin@mysql.com
d360687dc0 Fix an -ansi -pedantic compilation failure 2006-03-30 00:20:14 +04:00
konstantin@mysql.com
38bd424afa Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-15683
2006-03-30 00:20:13 +04:00
aivanov@mysql.com
2dfb139c08 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-merge
2006-03-30 00:20:12 +04:00
aivanov@mysql.com
6befdb5c2b Restoring changes erroneously removed by applying
the innodb-5.0-ss368 snapshot.
2006-03-30 00:17:35 +04:00
aivanov@mysql.com
f064a9f7d5 Restoring changes erroneously removed by applying
the innodb-5.0-ss368 snapshot.
2006-03-30 00:12:55 +04:00
monty@mysql.com
0e27cbeadc Merge monty@192.168.0.9:/my/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-03-29 23:01:35 +03:00
monty@mysql.com
8b21a9d46a Safety fix to ensure that long event names always ends with \0
This removes a warning about missing DBUG_ENTER while running tests
2006-03-29 22:58:34 +03:00
aivanov@mysql.com
3206820644 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-merge
2006-03-29 23:18:44 +04:00
aivanov@mysql.com
99d178033a Applied innodb-5.0-ss368 snapshot
Fixed bugs:
  : SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section
    dict_foreign_key_error_report(): Always print a newline after invoking
    dict_print_info_on_foreign_key_in_create_format().
  : Better InnoDB error message if ibdata files omitted from my.cnf.
  : CHECK TABLE on InnoDB causes a short hang during check of adaptive hash.
    CHECK TABLE blocking other queries, by releasing the btr_search_latch
    periodically during the adaptive hash table validation.
  : Valgrind: conditional jump or move depends on uninitialised valuesw.
    buf_block_init(): Reset magic_n, buf_fix_count, and io_fix to avoid testing
    uninitialised variables.
  : InnoDB uses full explicit table locks in stored FUNCTION.
  : When locks exhaust the buffer pool, InnoDB does not roll back the trx.
    Check in pessimistic insert and update if the buffer pool is exhausted by locks.
  : Disk space leaks in updates of InnoDB BLOB rows.
    btr_cur_pessimistic_update(): Invoke rec_get_offset() after rec_set_field_extern_bits().
    btr_store_big_rec_extern_fields(): Note that offsets will no longer be valid
    after calling this function.
  : When InnoDB returns error 'lock table full', MySQL can write to binlog too much.
  : InnoDB memory leak on duplicate key errors if row has many columns.
    row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at func_exit if needed.
  : Use consistent read in CREATE ... SELECT .. if innodb_locks_unsafe_for_binlog is used.
2006-03-29 23:04:32 +04:00
cmiller@zippy.(none)
c07a84f75f Reverting yesterday's patch. (cmiller:1.2099) 2006-03-29 10:56:11 -05:00
monty@mysql.com
c3e7c7aa4b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-03-29 17:28:40 +03:00
monty@mysql.com
cbd420a0c1 Remove compiler warnings
Add missing DBUG_RETURN
Fixed stack overflow in NdbBlob (found by ndb_gis.test)
Fixed access to freed memory in ndb_cluster_real_free_share()
2006-03-29 17:04:00 +03:00
knielsen@mysql.com
8553a60e76 Merged. 2006-03-29 15:45:23 +02:00
knielsen@mysql.com
a1b52d1256 Add substitutions for .ini files. 2006-03-29 15:39:53 +02:00
kent@mysql.com
0d332aef39 Merge 2006-03-29 15:05:06 +02:00
kent@mysql.com
67f2b0f3bc mysql_config.sh:
If installed, search built in lib path first, bug#13158
2006-03-29 14:59:53 +02:00
kent@mysql.com
37b916a728 Makefile.am:
Added "ndb_error_reporter" script, bug#18421
2006-03-29 14:18:29 +02:00
kent@mysql.com
ca29e362b5 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-03-29 14:08:13 +02:00
kent@mysql.com
e5ec09e888 Makefile.am:
Install "ndb_size.pl" script and template, bug#18421
2006-03-29 14:07:13 +02:00
petr@mysql.com
36e06f6372 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 15:41:13 +04:00
petr@mysql.com
4c285fc5fc fix test in --ps-protocol mode 2006-03-29 15:37:42 +04:00
monty@mysql.com
1994ed49ec Fixed compiler and valgrind warnings
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.

Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests
2006-03-29 14:27:36 +03:00
mskold@mysql.com
3b4422aa1e Added more debugging printouts 2006-03-29 13:13:39 +02:00
dlenev@mysql.com
41a895a1ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mysql.com:/home/dlenev/mysql-5.0-bg17764
2006-03-29 14:55:04 +04:00