summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* small changes to WL#43:Sergei Golubchik2010-04-306-25/+48
| | | | | | | | | consistency: don't use "index" and "key" interchangeably => rename "key" to "index" consistency: all option types are logical, besides ULL => rename ULL to NUMBER don't accept floats where integers are expected accept hexadecimal where integers are expected
* Merge OQGraph into MariaDB 5.2.unknown2010-05-0625-7/+3356
|\
| * MBug#524625: OQGraph error with binary logging enabledunknown2010-04-124-1/+48
| | | | | | | | Set the correct engine flags for OQGraph to get binlogging working.
| * Merge Oqgraph with MariaDB 5.2 trunkunknown2010-04-09154-786/+12173
| |\
| * | Fix type in merge, breaking `make dist` for oqgraph.unknown2010-03-311-1/+1
| | |
| * | Merge OQGraph into MariaDB 5.2.unknown2010-03-3173-361/+3813
| |\ \ | | | | | | | | | | | | (and in the process, fix compile-bintar to link C++ with g++ rather than gcc).
| | * | Fix compiler warningsunknown2010-03-311-2/+4
| | | |
| | * | OQGraph testsuite was forgotten from `make dist`.unknown2010-03-301-1/+2
| | | |
| | * | Comment out dtrace stuff for now, as it does not work properly on systems ↵unknown2010-03-302-60/+15
| | | | | | | | | | | | | | | | | | | | | | | | that lack dtrace. Remove generated header from bzr
| | * | automergeunknown2010-03-30861-8894/+26422
| | |\ \
| | * | | Require Boost version 1.40.0 to build OQGraph (earlier versions have a bug).unknown2010-03-303-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage/oqgraph/README: Added small README explaining the need for Boost storage/oqgraph/graphcore.cc: Fix using deprecated header that is gone in recent Boost. storage/oqgraph/plug.in: Change Boost detection to look for version number (patch by Sergei Golubchik).
| | * | | Fix wrong db_type for OQGraph hton.unknown2010-01-041-1/+1
| | | | |
| | * | | automergeunknown2010-01-041-0/+5
| | |\ \ \
| | * \ \ \ Merge mysql-test-run.pl fix for plugin detection.unknown2010-01-041-54/+61
| | |\ \ \ \
| | * | | | | Test skip due to missing OQGraph early, avoiding errors in log when starting ↵unknown2010-01-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | server.
| | * | | | | Merge OQGraph into latest MariaDB trunk.unknown2010-01-0420-2/+3329
| | |\ \ \ \ \
| | | * | | | | Import OQGraph engine into MariaDB.unknown2010-01-0420-2/+3329
| | | | | | | |
* | | | | | | | Automerge mariadb 5.1 -> mariadb 5.2unknown2010-05-0516-18/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Change commit mails to go to commits@mariadb.orgunknown2010-05-051-1/+1
| | | | | | | | |
| * | | | | | | | Fix missing bounds check in string conversion.unknown2010-04-292-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump version number for security fix release.
| * | | | | | | | Fix buffer overflow in COM_FIELD_LIST.Kristian Nielsen2010-04-282-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_base.cc: Replace strmov() with strnmov() to remove the possibility for buffer overflow. sql/sql_parse.cc: Reject COM_FIELD_LIST with too-big table or wildcard argument. (libmysqlclient doesn't allow sending too long arguments anyway, but we need this to protect against buffer overflow exploits).
| * | | | | | | | Fix a bunch of Windows warningsBo Thorsen2010-04-219-2/+35
| | | | | | | | |
| * | | | | | | | Remove unnecessary redefinition of TAILQ_EMPTYbo.thorsen2010-04-091-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove unnecessary redefinition of TAILQ_EMPTYbo.thorsen2010-04-091-1/+0
| |/ / / / / / / /
| * | | | | | | | Fix Windows compilebo.thorsen2010-04-092-2/+6
| | | | | | | | |
* | | | | | | | | don't hide old_password_plugin from embedded, it may be compiled with grant ↵Sergei Golubchik2010-04-141-2/+0
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | support
* | | | | | | | mergedSergei Golubchik2010-04-081-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fixed a problem of merge from mysql-5.1 baseline.Igor Babaev2010-04-081-0/+6
| | | | | | | |
* | | | | | | | fixes for buildbot:Sergei Golubchik2010-04-085-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update test results fix compilation failure on windows fix for ps-protocol mysql-test/r/plugin.result: make sure the PS handle is closed mysql-test/t/plugin.test: make sure the PS handle is closed sql/mysqld.cc: compilation failure: lable without a statement. sql/sql_plugin.cc: make plugin lock and plugin unlock use the same format of the dbug info string. print the ref_count *after* the lock and *after* the unlock.
* | | | | | | | fix dialog plugin to work againSergei Golubchik2010-04-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fgets, unlike gets, does not strip \n)
* | | | | | | | Merge with local treeMichael Widenius2010-04-0826-79/+112
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge with 5.1Michael Widenius2010-04-081-33/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed race condition in safe_process.cc which may have caused some ↵Michael Widenius2010-04-081-33/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Fixed compiler warningsMichael Widenius2010-04-083-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | | | Merge with 5.1Michael Widenius2010-04-0822-40/+91
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed syntax error and some timeing issues in test suiteMichael Widenius2010-04-083-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | Fixed suppression of compiler/test warningsMichael Widenius2010-04-074-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | Removed compiler warningsMichael Widenius2010-04-0716-23/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Fixed compiler warningMichael Widenius2010-04-081-1/+1
| | | | | | | | |
* | | | | | | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-0852-168/+1701
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | test fix for sol-sparc-32Sergei Golubchik2010-04-071-3/+3
| | | | | | | |
* | | | | | | | more fixes for buildbot failuresSergei Golubchik2010-04-062-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | fixes for builbot failures Sergei Golubchik2010-04-063-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | keep acl_user->auth_string and acl_user->salt always in syncSergei Golubchik2010-04-061-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | print authenticated via in show grants
* | | | | | | | fix a warningSergei Golubchik2010-04-061-1/+1
| | | | | | | |
* | | | | | | | Merge of the code for partitioned key cache (mwl#85) into 5.2.Igor Babaev2010-04-0536-333/+8240
|\ \ \ \ \ \ \ \
| * | | | | | | | Post review fixes.Igor Babaev2010-04-055-20/+127
| | | | | | | | |
| * | | | | | | | Merge with the latest changes of 5.2.Igor Babaev2010-04-053-20/+84
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | fixed a bug in handling mysql_native_password specified explicitly:Sergei Golubchik2010-04-053-20/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE USER mysqltest_up1 IDENTIFIED VIA mysql_native_password pointers were not always fixed, salt wasn't updated
| * | | | | | | | Merge with the latest changes of 5.2Igor Babaev2010-04-03105-510/+2461
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
View Lorry Controller Status