Commit graph

43254 commits

Author SHA1 Message Date
joerg@trift2.
df9c7a0fdc Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-03-01 13:48:35 +01:00
kent@kent-amd64.(none)
6b96135efb Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-02-28 22:34:34 +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@kent-amd64.(none)
12988e699b Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-02-28 22:26:54 +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@kent-amd64.(none)
2e39585c16 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-02-28 21:28:01 +01:00
kent@kent-amd64.(none)
1ac7b21717 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-02-28 21:24:11 +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.
91c4030c8a Merge trift2.:/MySQL/M50/upward-5.0
into  trift2.:/MySQL/M51/merge-5.1
2007-02-28 18:05:22 +01:00
gluh@mysql.com/eagle.(none)
2baf35b4fa added initialization of 'cmp_type' variable(to remove compiler warning) 2007-02-28 15:44:57 +04: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@eagle.(none)
be248ad0e0 Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-28 13:26:20 +04:00
gluh@mysql.com/eagle.(none)
f1f0de8419 valgrind error fix 2007-02-28 13:25:49 +04:00
kent@kent-amd64.(none)
061093e08b Merge mysql.com:/home/kent/bk/mysql-5.1.16-release
into  mysql.com:/home/kent/bk/mysql-5.1.16-build
2007-02-27 20:24:43 +01:00
sergefp@pylon.mylan
c3970e734c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/psergey/mysql-5.1-bug26117
2007-02-27 22:05:52 +03:00
sergefp@mysql.com
d61f9e2d89 BUG#26117 "index_merge sort-union over partitioned table crashes"
Before the fix: 
  ha_partition objects had ha_partition::m_part_info==NULL and that caused
  crash
After: 
- The new ha_partition::clone() function makes the clones use parent's
  m_part_info value.
- The parent ha_partition object remains responsible for deallocation of
  m_part_info.
2007-02-27 22:01:03 +03:00
monty@mysql.com/narttu.mysql.fi
0cabe9d4f2 Fix (last) compiler warnings 2007-02-27 20:06:37 +02:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3 Remove compiler warnings 2007-02-27 19:31:49 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
6163508f85 Fixes for compiler warnings. 2007-02-27 11:27:04 +02:00
gluh@eagle.(none)
1967d342e4 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-27 12:39:05 +04:00
gluh@mysql.com/eagle.(none)
b3cb846680 removed unused variable 2007-02-27 12:37:17 +04:00
gluh@mysql.com/eagle.(none)
e5bd4308b4 after merge fix 2007-02-27 12:16:41 +04:00
df@pippilotta.erinye.com
b830538322 BUG#20013 No pentium_cflags in SETUP.sh
---
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-20013
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
---
reorder lines from BUG#20013 to resemble order in 5.0
2007-02-26 17:06:10 +01:00
gluh@mysql.com/eagle.(none)
148332907a after merge fix 2007-02-26 19:49:24 +04:00
gluh@eagle.(none)
e7d639a030 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-26 17:47:50 +04:00
gluh@eagle.(none)
1d49f79c53 Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-26 17:46:52 +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
gluh@mysql.com/eagle.(none)
086aa9d3c0 after merge fix 2007-02-26 16:52:54 +04:00
gluh@eagle.(none)
975a23ed0f Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-26 15:54:43 +04:00
knielsen@ymer.(none)
83a5eac0a4 Merge ymer.(none):/tmp/mysql-5.0
into  ymer.(none):/tmp/mysql-5.1
2007-02-26 08:12:02 +01: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
kent/mysqldev@mysql.com/production.mysql.com
f52c75e109 mi_open.c:
#if => #ifdef
2007-02-26 00:44:12 +01: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/narttu.mysql.fi
3d34c6f957 Fixed windows compilation problems 2007-02-24 04:22:34 +02:00
monty@mysql.com/narttu.mysql.fi
520d1b4144 Fixed compilations problems and warnings on windows 2007-02-23 22:48:15 +02:00
monty@narttu.mysql.fi
6d78655a97 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2007-02-23 13:28:34 +02:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9 Fixed compiler warnings
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.

Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.

Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
2007-02-23 13:13:55 +02:00
pekka@clam.ndb.mysql.com/clam.(none)
f668fabb61 ndb - 5.1.16 uint64 align for ndb_restore 2007-02-23 04:21:39 +01: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