Commit graph

34845 commits

Author SHA1 Message Date
unknown
c06d757e8e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0


sql/sql_table.cc:
  Auto merged
2006-05-24 15:13:49 +05:00
unknown
9972f4bf5d configure.in:
Changed version to 5.0.22


configure.in:
  Changed version to 5.0.22
2006-05-24 11:33:17 +02:00
unknown
d5df934288 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-05-24 12:09:16 +03:00
unknown
83cd9eca30 Bug #16997 Table rename that changes database does not rename indexes: merge 2006-05-24 10:58:12 +02:00
unknown
12a0f4ff14 Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089)
Fixed compiler warnings
Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490)


sql/field.cc:
  remove dflt_field from field structure (not needed)
  Simple cleanup of code that been copied elsewhere
sql/field.h:
  remove dflt_field from field structure (not needed)
sql/item.h:
  Removed compiler warnings
sql/item_timefunc.cc:
  Fixed Item_date_add_intervall::eq
  The problem was that when we call 'eq' 'this' is not fixed, which means we can't call const_item() or a value function.
  I fixed this so that we check eq for all arguments and that the sign and type are identical.
  (The original code gave a 'accessing uninitialized data' in valgrind.
sql/mysql_priv.h:
  Added default fields to create_tmp_field
sql/sql_insert.cc:
  New default_field parameter to create_tmp_field()
sql/sql_select.cc:
  New default_field parameter to create_tmp_field()
  Use this in create_tmp_table() to set right default value for a field
2006-05-24 11:56:59 +03:00
unknown
bd1d3ebbd6 bug #19650 (Embedded crashes in 5.1.10)
mysql-test/extra/binlog_tests/innodb_stat.test:
  test doesn't work with the embedded server
sql/log.cc:
  code shouldn't work without row based replication
sql/sql_insert.cc:
  code shouldn't work without row based replication
2006-05-24 13:28:24 +05:00
unknown
81dd2cd096 Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
2006-05-24 10:16:31 +02:00
unknown
9636f9eded Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
2006-05-24 10:08:26 +02:00
unknown
a04d9fa947 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:34:24 +05:00
unknown
b056eac648 Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
2006-05-24 12:31:39 +05:00
unknown
59c2b9702d Fix missing source file. 2006-05-24 09:28:37 +02:00
unknown
a3687d58f0 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-05-24 09:23:45 +02:00
unknown
89fdbbeb36 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
2006-05-24 10:47:09 +05:00
unknown
d4aa0b8d92 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 19:08:28 -07:00
unknown
8bd23f0725 Fix events_logs_tests so it won't fail on Windows due to appearance
of hostname in query results.


mysql-test/r/events_logs_tests.result:
  Update results
mysql-test/t/events_logs_tests.test:
  Replace user_host in results, since it is system dependent.
2006-05-23 17:51:17 -07:00
unknown
ac975b1371 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-05-23 17:33:12 -07:00
unknown
4bccc3361a Removing mysql_explain_log from 5.1
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Delete: scripts/mysql_explain_log.sh
scripts/Makefile.am:
  Removing mysql_explain_log
scripts/make_binary_distribution.sh:
  Removing mysql_explain_log
support-files/mysql.spec.sh:
  Remove reference to mysql_explain_log
2006-05-23 17:26:56 -07:00
unknown
f02b0d8afd configure.in:
Updated release number 4.1.16a


configure.in:
  Updated release number 4.1.16a
2006-05-24 01:05:20 +02:00
unknown
6a60accef2 don't let bugfix for bug#8303 break the bugfix for bug#8378
revert the fix for bug#8303
correct the test for bug#8378


mysql-test/r/ctype_sjis.result:
  updated
mysql-test/t/ctype_sjis.test:
  updated
sql/sql_lex.cc:
  revert the fix for bug#8303
tests/mysql_client_test.c:
  correct the test for bug#8378
2006-05-24 00:55:53 +02:00
unknown
3100a6ca6e Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 15:13:30 -07:00
unknown
90ebc32456 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-23 13:03:33 -07:00
unknown
f04b9f2473 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0--bug11151


sql/sp_head.cc:
  Auto merged
2006-05-23 15:01:05 -04:00
unknown
1d5999dc6d configure.in:
Changed version to 5.0.17c


configure.in:
  Changed version to 5.0.17c
2006-05-23 20:43:48 +02:00
unknown
bc1784298f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


include/m_string.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  C
  Merged.
  ?
2006-05-23 20:28:52 +02:00
unknown
821daed661 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1


sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-05-23 11:25:11 -07:00
unknown
6f42227f31 Bug#19938 Valgrind error (race) in handle_slave_sql()
sql/slave.cc:
  Read the value of rli->events_till_abort only in debug compile
2006-05-23 20:16:57 +02:00
unknown
041171fd81 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/log_tables.result:
  Merge conflict
mysql-test/t/log_tables.test:
  Merge conflict
2006-05-23 09:49:04 -07:00
unknown
4cf24a5160 event_scheduler.h, event_scheduler.cc:
Rename load_event() to load_named_event(), to avoid name clash on HP-UX


sql/event_scheduler.cc:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX
sql/event_scheduler.h:
  Rename load_event() to load_named_event(), to avoid name clash on HP-UX
2006-05-23 17:47:17 +02:00
unknown
7d01d11c8d Removed wrong ascii codes from source code.
Fixed core dump in --help


include/heap.h:
  Removed a wrong character (ascii 0xa0), which looked like a space.
  This will cause some debuggers display the source code in a wrong
  way. May cut the rest of the file off and looks like a debugger
  problem, which it isn't.
mysys/my_getopt.c:
  Removed a wrong character (ascii 0xa0), which looked like a space.
  This will cause some debuggers display the source code in a wrong
  way. May cut the rest of the file off and looks like a debugger
  problem, which it isn't.
sql/mysqld.cc:
  Wrong type.
2006-05-23 18:27:54 +03:00
unknown
1b32376ab8 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/information_schema.test:
  Auto merged
2006-05-23 17:05:37 +02:00
unknown
c2330977cb Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release
2006-05-23 16:51:37 +02:00
unknown
05d44302b9 __FUNCTION__ is not available everywhere.
make us see at least with gcc the function proto. this can be extended
probably for windows too.
Fix build on intelxeon3 (sun compiler and others)


sql/event_scheduler.cc:
  __FUNCTION__ is not available everywhere.
  make us see at least with gcc the function proto. this can be extended
  probably for windows too.
2006-05-23 16:50:01 +02:00
unknown
13eedad2d0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-23 16:30:50 +02:00
unknown
6df2a7d0ba Guilhelm suggested that the "load data infile" command should be flagged as
not transaction-safe for stored procedures.  Related to Bug#11151.


sql/sp_head.cc:
  Guilhelm suggested that the "load data infile" command should be flagged as
  not transaction-safe for stored procedures.
2006-05-23 10:29:58 -04:00
unknown
14909cb00a Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/mysqld.cc:
  Auto merged
2006-05-23 16:27:40 +02:00
unknown
a6cc2de9f6 Bug #19938 Valgrind error (race) in handle_slave_sql()
sql/slave.cc:
  Read rli->events_till_abort to a temporary variable before unlocking the mutex
2006-05-23 16:20:03 +02:00
unknown
a2fb5dc56a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060523082057|49143
sql/slave.cc:
  Exclude
2006-05-23 16:14:48 +02:00
unknown
375615f7fc Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
2006-05-23 16:07:23 +02:00
unknown
54526d177f Make wait_timeout test not timing dependent
mysql-test/t/wait_timeout.test:
  Remove sleeps from wait_timeout in order to make it timing independent.
  Instead get the status variable "aborted_clients" in a seconds connection.
2006-05-23 15:45:16 +02:00
unknown
f112e407ea Bug #18742: Test 'group_min_max' fails if "classic" configuration in 5.0
Moved the InnoDB related tests to innodb_mysql


mysql-test/r/group_min_max.result:
  Moved innodb related tests out of group_min_max
mysql-test/r/innodb_mysql.result:
  Moved innodb related tests out of group_min_max
mysql-test/t/group_min_max.test:
  Moved innodb related tests out of group_min_max
mysql-test/t/innodb_mysql.test:
  Moved innodb related tests out of group_min_max
2006-05-23 16:43:01 +03:00
unknown
2b8527e945 Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 15:07:08 +02:00
unknown
749f183265 update log_tables.test so it is less fragile
mysql-test/r/log_tables.result:
  update result so test is less fragile
mysql-test/t/log_tables.test:
  update test so it is less fragile
2006-05-23 15:01:23 +02:00
unknown
63b84034f8 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-release
2006-05-23 14:39:30 +02:00
unknown
42bfdef07d Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
2006-05-23 17:30:55 +05:00
unknown
d78ee0ab4f Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 13:49:24 +02:00
unknown
0f5df8e161 BUG#17455: Wrong results from Repair/Optimize .. table for partitioned tables
mysql-test/r/partition.result:
  New test case
mysql-test/t/partition.test:
  New test case
sql/ha_partition.cc:
  Fixed error handling
2006-05-23 07:39:35 -04:00
unknown
1e12f9462b BUG#19304: Merge handler allowed in partitioned tables
mysql-test/r/partition.result:
  New test case
mysql-test/t/partition.test:
  New test case
sql/partition_info.cc:
  Check for not merge handler in partitioned table
sql/share/errmsg.txt:
  New error message
2006-05-23 07:37:03 -04:00
unknown
91552f962f various fixes after push of fix for bug#17619
mysql-test/r/not_embedded_server.result:
  update result
mysql-test/r/sp-threads.result:
  update result
sql/event_scheduler.h:
  fix build error with SUN compiler
sql/mysqld.cc:
  fix problem with --init-file which was expecting to be the only running
  thread. nevertheless Events should be started as close as possible to the
  place connections are handled.
2006-05-23 13:32:22 +02:00
unknown
0324202514 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-05-23 13:23:45 +02:00
unknown
3d2a3c4175 Merge lmy004.:/work/mysql-5.1-release
into lmy004.:/work/mysql-5.1-release-17619-try3
2006-05-23 12:13:02 +02:00