Commit graph

64436 commits

Author SHA1 Message Date
Michael Widenius
664709e7af Merge with 5.1 2010-04-08 16:03:43 +03:00
Michael Widenius
8ee9c63668 Fixed compiler warnings
Changed version string to beta

client/mysql.cc:
  Fixed compiler warning
configure.in:
  Changed version string to beta
plugin/auth/dialog.c:
  Fixed compiler warning (gets() is a not recommended function)
2010-04-08 16:02:49 +03:00
Sergei Golubchik
e24e1668bc MWL#43 CREATE TABLE options (by Sanja)
Docs/sp-imp-spec.txt:
  New sql_mode added.
include/my_base.h:
  Flag in frm of create options.
libmysqld/CMakeLists.txt:
  New files added.
libmysqld/Makefile.am:
  New files added.
mysql-test/r/events_bugs.result:
  New sql_mode added.
mysql-test/r/information_schema.result:
  New sql_mode added.
mysql-test/r/sp.result:
  New sql_mode added.
mysql-test/r/system_mysql_db.result:
  New sql_mode added.
mysql-test/suite/funcs_1/r/is_columns_mysql.result:
  New sql_mode added.
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
  New sql_mode added.
mysql-test/t/events_bugs.test:
  New sql_mode added.
mysql-test/t/sp.test:
  New sql_mode added.
scripts/mysql_system_tables.sql:
  New sql_mode added.
scripts/mysql_system_tables_fix.sql:
  New sql_mode added.
sql/CMakeLists.txt:
  New files added.
sql/Makefile.am:
  New files added.
sql/event_db_repository.cc:
  New sql_mode added.
sql/field.cc:
  Create options support added.
sql/field.h:
  Create options support added.
sql/ha_partition.cc:
  Create options support added.
sql/handler.cc:
  Create options support added.
sql/handler.h:
  Create options support added.
sql/log_event.h:
  New sql_mode added.
sql/mysql_priv.h:
  New sql_mode added.
sql/mysqld.cc:
  New sql_mode added.
sql/share/errmsg.txt:
  New error messages added.
sql/sp.cc:
  New sql_mode added.
sql/sp_head.cc:
  Create options support added.
sql/sql_class.cc:
  Create options support added.
  Debug added.
sql/sql_class.h:
  Create options support added.
sql/sql_insert.cc:
  my_safe_a* moved to mysqld_priv.h
sql/sql_lex.h:
  Create options support added.
sql/sql_parse.cc:
  Create options support added.
sql/sql_show.cc:
  Create options support added.
sql/sql_table.cc:
  Create options support added.
sql/sql_view.cc:
  New sql_mode added.
sql/sql_yacc.yy:
  Create options support added.
sql/structs.h:
  Create options support added.
sql/table.cc:
  Create options support added.
sql/table.h:
  Create options support added.
sql/unireg.cc:
  Create options support added.
storage/example/ha_example.cc:
  Create options example.
storage/example/ha_example.h:
  Create options example.
storage/pbxt/src/discover_xt.cc:
  Create options support added.
2010-04-08 14:10:05 +02:00
Michael Widenius
4a4627104d Fixed race condition in safe_process.cc which may have caused some mysqltests to be reported as failed even if they succeded.
mysql-test/lib/My/SafeProcess/safe_process.cc:
  Fixed race condition when getting a signal while calling waitpid()
  Don't send kill on killed processes
  Return different exit codes depending on how we die.
2010-04-08 14:56:57 +03:00
Michael Widenius
db1d83a5cc Merge with 5.1 2010-04-08 12:52:53 +03:00
Michael Widenius
a91e89dec6 Fixed compiler warning 2010-04-08 12:51:22 +03:00
Michael Widenius
04ff96f789 Fixed syntax error and some timeing issues in test suite
mysql-test/r/func_time.result:
  Updated result
mysql-test/t/func_time.test:
  sysdate() could be same even with one sleep(1) in between.
storage/maria/ma_loghandler.c:
  Fixed syntax error
2010-04-08 12:47:31 +03:00
Vasil Dimov
9e451f11a1 Merge from innodb-branches-zip 2010-04-07 22:42:25 +03:00
Vasil Dimov
c611ba32e6 Merge from SVN 2010-04-07 22:41:50 +03:00
Vasil Dimov
7bacdb6a97 Merge from innodb-branches-zip 2010-04-07 22:00:06 +03:00
Vasil Dimov
3e7b21ca55 Merge from innodb-branches-5.1 2010-04-07 21:59:02 +03:00
Vasil Dimov
c0ce051d78 Merge from SVN 2010-04-07 21:53:09 +03:00
Vasil Dimov
b15553d742 Merge from SVN 2010-04-07 21:52:37 +03:00
vdimov
c7020fd5e7 branches/zip: Whitespace fixup in univ.i 2010-04-07 18:40:38 +00:00
Vasil Dimov
f4f1f0af3e Repply changes to storage/innodb_plugin/plug.in that were made by MySQL 2010-04-07 21:33:36 +03:00
Vasil Dimov
50dcbe69b4 Repply changes to storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt that were made by MySQL 2010-04-07 21:30:44 +03:00
csun
5b35bb91a0 branches/zip: fix compiler errors on Windows.
Move ut_ad() to after declarations for C file.
2010-04-07 18:24:55 +00:00
Vasil Dimov
18420c70de Repply changes to storage/innodb_plugin/mysql-test/*.opt that were made by MySQL 2010-04-07 21:17:13 +03:00
Vasil Dimov
41e5a2fb78 Repply changes to storage/innodb_plugin/handler/ha_innodb.cc that were made by MySQL 2010-04-07 20:44:47 +03:00
Vasil Dimov
f30e7a4c4a Repply changes to storage/innodb_plugin/Makefile.am that were made by MySQL 2010-04-07 20:24:43 +03:00
Vasil Dimov
e436d25b7f Reapply changes to storage/innodb_plugin/CMakeLists.txt that were made by MySQL 2010-04-07 20:21:15 +03:00
Vasil Dimov
9a6d13afed Import branches/zip@r6960 from SVN on top of storage/innodb_plugin 2010-04-07 19:53:14 +03:00
Michael Widenius
b34262264a Fixed suppression of compiler/test warnings
Fixed some timing issues in test suite



mysql-test/mysql-test-run.pl:
  Added suppression of errors that comes when master is killed before slave has connect (like with rpl_udf.test)
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Wait for check thread to end
mysql-test/suite/pbxt/t/status.test:
  Added longer sleep to avoid timing issue
support-files/compiler_warnings.supp:
  Fixed wrong suppression
2010-04-07 18:26:30 +03:00
Sergei Golubchik
8e122db92d test fix for sol-sparc-32 2010-04-07 17:05:09 +02:00
Vasil Dimov
4798cb0754 Merge from mysql-5.1-innodb 2010-04-07 15:43:25 +03:00
Vasil Dimov
10cff88638 Merge from mysql-5.1 2010-04-07 15:32:51 +03:00
Vasil Dimov
d587bd4b15 Move everything into a subdirectory xyz/ 2010-04-07 14:18:43 +03:00
mmakela
445c88474b branches/zip: innobase_init(): Correct the error message
about wrong innodb_change_buffering value.  Reported by Ranger.
2010-04-07 11:03:54 +00:00
mmakela
01f991351c branches/zip: buf_flush_block_cmp(): Do not mix declarations and code.
Stick to C90, because some build platforms are not C99 yet.
2010-04-07 06:21:26 +00:00
Michael Widenius
1bee590347 Removed compiler warnings
Removed random failures from test suite

mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
  Make test predicatable.
mysql-test/include/maria_empty_logs.inc:
  We can't use 'Threads_connected' for syncronization, as the 'check_warnings' thread that just quit may still be counted in 'Threads_connected'
  Now we just wait until MySQLD answers again, which should be good enough for our purposes
mysql-test/suite/binlog/r/binlog_index.result:
  Updated results file
mysql-test/suite/binlog/t/binlog_index-master.opt:
  Added option file to not get stack traces in .err file.
mysql-test/suite/binlog/t/binlog_index.test:
  Added 'flush tables' to remove warning about crashed suppression file from logs
mysql-test/suite/pbxt/r/multi_statement.result:
  Updated results
mysql-test/suite/pbxt/t/multi_statement-master.opt:
  Added options so that slow query testing makes sense
sql/events.cc:
  Don't write Event Scheduler startup message if warnings are turned off.
sql/handler.cc:
  Removed compiler warning
sql/log.cc:
  Removed compiler warning
sql/mysqld.cc:
  Added option 'test-expect-abort'; If this is set, we don't write message to log in case of 'DBUG_ABORT'.
  (Gives us smaller, easier to read log files)
sql/set_var.cc:
  Removed compiler warning
sql/slave.cc:
  Removed compiler warning
sql/sql_plugin.cc:
  Don't write warnings about disabled plugin if using --log_warnings=0
storage/xtradb/include/ut0lst.h:
  Removed compiler warning
support-files/compiler_warnings.supp:
  Supress warning from xtradb
2010-04-07 01:47:08 +03:00
Sergei Golubchik
076a13784d more fixes for buildbot failures
sql/log_event.cc:
  revert a wrong attempt to get rid of a warning.
  it broke tests on x86
sql/sql_show.cc:
  more fixes for old gcc
2010-04-06 23:49:01 +02:00
Sergei Golubchik
0b23966fe2 fixes for builbot failures
mysql-test/t/connect.test:
  replace the port correctly
sql/set_var.cc:
  opensolaris gcc (or just an old gcc ?) does not like offsetof() as a case label.
2010-04-06 20:36:06 +02:00
vdimov
0499a0e1eb branches/zip: Whitespace fixup 2010-04-06 18:05:54 +00:00
vdimov
fa9a1bd5ea Change the BZR property 2010-04-06 17:55:02 +00:00
vdimov
7bc95409dc Set some experimental properties 2010-04-06 17:48:35 +00:00
vdimov
bc553eefb5 Set some experimental properties that could help with the merge into BZR. 2010-04-06 16:20:33 +00:00
vdimov
1199a0e5fb branches/5.1:
Fix ./export.sh to honor ENDREV
2010-04-06 16:18:25 +00:00
unknown
7357c325b9 Raise version number after cloning 5.1.46 2010-04-06 15:57:33 +02:00
mmakela
72d602070a branches/zip: Add debug checks to track down Issue #461.
dict_table_check_for_dup_indexes(): Add the flag tmp_ok.  If !tmp_ok,
check that no index name starts with TEMP_INDEX_PREFIX.

ha_innobase::add_index(), ha_innobase::prepare_drop_index(),
ha_innobase::final_drop_index(): Call dict_table_check_for_dup_indexes().
2010-04-06 12:11:46 +00:00
Sergei Golubchik
fd3e6e376e keep acl_user->auth_string and acl_user->salt always in sync
print authenticated via in show grants
2010-04-06 13:04:56 +02:00
Sergei Golubchik
d04d8aa6bb fix a warning 2010-04-06 13:02:24 +02:00
Aleksandr Kuzminsky
b5c1db05ad percona-xtradb-common provides mysql-common 2010-04-06 01:23:16 -07:00
Georgi Kodinov
031d698c58 changed the version back 2010-04-06 10:58:45 +03:00
Georgi Kodinov
c9cfd2df5f merge 2010-04-06 10:56:11 +03:00
Georgi Kodinov
e1dbabba15 merge 2010-04-06 10:51:52 +03:00
Igor Babaev
be12916213 Merge of the code for partitioned key cache (mwl#85) into 5.2. 2010-04-05 23:56:39 -07:00
mmakela
72a38104ea branches/zip: trx0sys.ic: Correct a typo in a comment. 2010-04-06 06:14:51 +00:00
Igor Babaev
a37899a81a Post review fixes. 2010-04-05 19:08:10 -07:00
Igor Babaev
8730d0a4dd Merge with the latest changes of 5.2. 2010-04-05 13:28:09 -07:00
Sergey Glukhov
c1ad5072b8 Bug#52336 Segfault / crash in 5.1 copy_fields (param=0x9872980) at sql_select.cc:15355
The problem is that we can not use make_cond_for_table().
This function relies on used_tables() condition
which is not set properly for subqueries.
As result subquery is not filtered out.
The fix is to use remove_eq_conds() function instead
of make_cond_for_table() func. 'remove_eq_conds()'
algorithm relies on const_item() value and it allows
to handle subqueries in right way.


mysql-test/r/having.result:
  test case
mysql-test/t/having.test:
  test case
sql/sql_select.cc:
  The fix is to use remove_eq_conds() function instead
  of make_cond_for_table() function.
2010-04-05 16:10:26 +05:00