summaryrefslogtreecommitdiff
path: root/sql/lex.h
Commit message (Collapse)AuthorAgeFilesLines
* Updated/added copyright headersKent Boortz2011-06-301-2/+2
|\
| * Updated/added copyright headersKent Boortz2011-06-301-2/+5
| |\
| | * Merge mysqldev@production.mysql.com:my/mysql-5.0-releasecmiller@zippy.cornsilk.net2007-04-261-0/+13
| | |\ | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
* | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-2/+3
| | | | | | | | | | | | | | | | Merged the implementation to a new base tree.
* | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-201-1/+1
|\ \ \ \
| * \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-0/+4
| |\ \ \ \
| * | | | | Backport of:Konstantin Osipov2009-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------ revno: 2617.68.25 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-next-bg-pre2-2 timestamp: Wed 2009-09-16 18:26:50 +0400 message: Follow-up for one of pre-requisite patches for fixing bug #30977 "Concurrent statement using stored function and DROP FUNCTION breaks SBR". Made enum_mdl_namespace enum part of MDL_key class and removed MDL_ prefix from the names of enum members. In order to do the latter changed name of PROCEDURE symbol to PROCEDURE_SYM (otherwise macro which was automatically generated for this symbol conflicted with MDL_key::PROCEDURE enum member).
* | | | | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-02-171-2/+0
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | A set of program options and variables was deprecated in MySQL 5.1, and is hereby removed.
* | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test Text conflict in mysql-test/r/mysqlbinlog2.result Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result Text conflict in mysql-test/suite/rpl/r/rpl_udf.result Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test Text conflict in sql/field.h Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysql_priv.h Text conflict in sql/share/errmsg.txt Text conflict in sql/sp.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.h Text conflict in sql/sql_db.cc Text conflict in sql/sql_delete.cc Text conflict in sql/sql_insert.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_lex.h Text conflict in sql/sql_load.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_update.cc Text conflict in sql/sql_view.cc Conflict adding files to storage/innobase. Created directory. Conflict because storage/innobase is not versioned, but has versioned children. Versioned directory. Conflict adding file storage/innobase. Moved existing file to storage/innobase.moved. Conflict adding files to storage/innobase/handler. Created directory. Conflict because storage/innobase/handler is not versioned, but has versioned children. Versioned directory. Contents conflict in storage/innobase/handler/ha_innodb.cc
| * | | | WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flush2009-12-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for flushing individual logs, so that the user can selectively flush a subset of the server logs. Flush of individual logs is done according to the following syntax: FLUSH <log_category> LOGS; The syntax is extended so that the user is able to flush a subset of logs: FLUSH [log_category LOGS,]; where log_category is one of: SLOW ERROR BINARY ENGINE GENERAL RELAY.
* | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/r/show_check.result Text conflict in mysql-test/r/sp-code.result Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/t/disabled.def Text conflict in mysql-test/t/show_check.test Text conflict in mysys/my_delete.c Text conflict in sql/item.h Text conflict in sql/item_cmpfunc.h Text conflict in sql/log.cc Text conflict in sql/mysqld.cc Text conflict in sql/repl_failsafe.cc Text conflict in sql/slave.cc Text conflict in sql/sql_parse.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_yacc.yy Text conflict in storage/myisam/ha_myisam.cc Corrected results for stm_auto_increment_bug33029.reject 2009-12-01 20:01:49.000000000 +0300 <andrei> @@ -42,9 +42,6 @@ <andrei> RETURN i; <andrei> END// <andrei> CALL p1(); <andrei> -Warnings: <andrei> -Note 1592 Statement may not be safe to log in statement format. <andrei> -Note 1592 Statement may not be safe to log in statement format. There should be indeed no Note present because there is in fact autoincrement top-level query in sp() that triggers inserting in yet another auto-inc table. (todo: alert DaoGang to improve the test).
| * | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: Backport of: bzr log -r revid:sp1r-serg@sergbook.mysql.com-20070505200319-38337 ------------------------------------------------------------ revno: 2469.263.4 committer: serg@sergbook.mysql.com timestamp: Sat 2007-05-05 13:03:19 -0700 message: Removing deprecated features: --master-XXX command-line options log_bin_trust_routine_creators table_type BACKUP TABLE ... RESTORE TABLE ... SHOW PLUGIN LOAD TABLE ... FROM MASTER LOAD DATA FROM MASTER SHOW INNODB STATUS SHOW MUTEX STATUS SHOW TABLE TYPES ... TIMESTAMP(N) ... TYPE=engine RESET SLAVE don't reset connection parameters anymore LOAD DATA: check opt_secure_file_priv before access(filename) improved WARN_DEPRECATED macro
* | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr.
| * | | | merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixesAndrei Elkin2009-10-011-0/+1
| |\ \ \ \
| | * | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay logLuis Soares2009-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files NOTE: this is the backport to next-mr. SHOW BINLOG EVENTS does not work with relay log files. If issuing "SHOW BINLOG EVENTS IN 'relay-log.000001'" in a non-empty relay log file (relay-log.000001), mysql reports empty set. This patch addresses this issue by extending the SHOW command with RELAYLOG. Events in relay log files can now be inspected by issuing SHOW RELAYLOG EVENTS [IN 'log_name'] [FROM pos] [LIMIT [offset,] row_count].
| * | | | | backporting bug@27808 fixesAndrei Elkin2009-10-011-0/+1
| | | | | |
| * | | | | WL#342 heartbeatAndrei Elkin2009-09-291-0/+1
| |/ / / / | | | | | | | | | | | | | | | backporting from 6.0 code base to 5.1.
| * | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+5
| |/ / / | | | | | | | | | | | | Adding header include file guards to files that are missing such.
* | | | WL#1397 convert XML -> SQLAlexander Barkov2009-10-121-0/+1
| | | |
* | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-0/+14
|/ / / | | | | | | | | | | | | | | | | | | WL#2265 (RESIGNAL) Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal, plus required dependencies.
* | | Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE ↵Guilhem Bichot2009-07-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | accepted, does nothing": those keywords do nothing in 5.1 (they are meant for future versions, for example featuring the Maria engine) so they are here removed from the syntax. Adding those keywords to future versions when needed is: - WL#5034 "Add TRANSACTIONA=0|1 and PAGE_CHECKSUM=0|1 clauses to CREATE TABLE" - WL#5037 "New ROW_FORMAT value for CREATE TABLE: PAGE"
* | | Removed extra symbol during merge.jani@a88-113-38-195.elisa-laajakaista.fi2008-02-121-1/+0
| | |
* | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-081-1/+5
|\ \ \ | | | | | | | | | | | | into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
| * | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1monty@mysql.com/narttu.mysql.fi2007-10-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reserver namespace and place in frm for TABLE_CHECKSUM and PAGE_CHECKSUM create options - Added syncing of directory when creating .frm files - Portability fixes - Added missing cast that could cause bugs - Code cleanups - Made some bit functions inline - Moved things out of myisam.h to my_handler.h to make them more accessable - Renamed some myisam variables and defines to make them more globaly usable (as they are used outside of MyISAM) - Fixed bugs in error conditions - Use compiler time asserts instead of run time - Fixed indentation HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP as the old name was wrong (Added a define for old value to ensure we don't break any old code) Added HA_EXTRA_PREPARE_FOR_RENAME as a signal for rename (before we used a DROP signal which is wrong) - Initialize error messages early to get better errors when mysqld or an engine fails to start - Fix windows bug that query_performance_frequency was not initialized if registry code failed - thread_stack -> my_thread_stack_size
* | | | Fix up merge. Some macros are now functions. Some functions arecmiller@zippy.cornsilk.net2007-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | renamed. Some new THD proc_info states are new. Directories must be encountered in make in a specific order, to have symlinks already set. Move community-server-specific tests into own tests, so that we can exempt them from testing on enterprise servers.
* | | | Merge ↵cmiller@zippy.cornsilk.net2007-04-271-0/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02
| * | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51cmiller@zippy.cornsilk.net2007-04-251-0/+13
| |\ \ \ | | |/ / | |/| / | | |/ into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-031-0/+13
| | |\ | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
| | | * Bug#24795: Add SHOW PROFILEcmiller@zippy.cornsilk.net2007-01-031-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Patch contributed by Jeremy Cole. CLA received Oct 2006 by Kaj Arnö Add rudimentary query profiling support.
| * | | Fix -ansi -pedantic warning (can't cast a pointer to function kostja@bodhi.local2007-03-081-2/+2
| |/ / | | | | | | | | | | | | to a pointer to object, that is, int foo(); void *bar= (void*) foo is not allowed.
* | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991msvensson@pilot.blaudden2007-03-291-0/+1
|\ \ \ | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certmsvensson@pilot.blaudden2007-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add MASTER_SSL_VERIFY_SERVER_CERT option to CHANGE MASTER TO - Add Master_Ssl_Serify_Server_Cert to SHOW SLAVE STATUS - Save and restore ssl_verify_server_cert to master info file setting it to disabled as default.
* | | | Fixed compilations problems and warnings on windowsmonty@mysql.com/narttu.mysql.fi2007-02-231-1/+1
|/ / /
* | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff/marcsql@weblab.(none)2007-01-121-2/+0
|\ \ \ | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-22687
| * | | Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS)malff/marcsql@weblab.(none)2007-01-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to some internal communication, these two functions are place holders for future enhancements. Because they use a variable number of parameters, the implementation defined a reserved keyword for them in the parser grammar. Unfortunately, doing so creates a bug similar to Bug 21114 reported for the function FORMAT. In the 5.1 code base, due to improvements in the code implemented with bug 21114, having a reserved keyword for functions with a variable number of arguments is not needed any more by the implementation. As a result, this fix removes the place-holder implementation, and removes the unnecessary reserved keywords. Should the functions UNIQUE_USERS and GROUP_UNIQUE_USERS be finally implemented in a later release, the implementation should sub class Create_native_func in sql/item_create.cc. For example, see the class Create_func_concat.
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ | | |/ / | |/| | | | | | into mysql.com:/home/kent/bk/main/mysql-5.1
| * | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| | |/ | |/| | | | | | | Changed header to GPL version 2 only
* | | WL# 3031patg@radha.tangent.org2006-12-011-0/+7
| |/ |/| | | | | | | | | | | | | Backport of functionality in private 5.2 tree. Added new language to parser, new mysql.servers table and associated code to be used by the federated storage engine to allow central connection information per WL entry.
* | Merge alik.:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@alik.2006-11-071-2/+4
|\ \ | | | | | | | | | into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
| * | Bug#18888 Trying to overwrite sql/lex_hash.h during buildmsvensson@shellback.(none)2006-10-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As a sideeffect of the patch to generate lex_hash.h only once on the machine where the source dist was produced, a problem was found when compiling a mysqld without partition support - it would crash when looking up the lex symbols due to mismatch between lex.h and the generated lex_hash.h - Remove the ifdef for partition in lex.h - Fix minor problem with"EXPLAIN PARTITION" when not compiled with partition(existed also without the above patch) - Add test case that will be run when we don't have partition support compiled into mysqld - Return error ER_FEATURE_DISABLED if user tries to use PARTITION when there is no support for it.
* | | Bug#21114 (Foreign key creation fails to table with name format)malff/marcsql@weblab.(none)2006-11-021-211/+5
|/ / | | | | | | | | | | | | Due to the complexity of this change, everything is documented in WL#3565 This patch is the third iteration, it takes into account the comments received to date.
* | WL#3337 (Event scheduler new architecture)andrey@example.com2006-09-121-1/+0
| | | | | | | | | | | | | | | | | | Remove SHOW SCHEDULER STATUS command and migrate the information output to `mysqladmin debug` (COM_DEBUG) SHOW SCHEDULER STATUS was introduced in 5.1.11, provided some debug information about event scheduler internals and was enabled only in debug builds.
* | This is the second patch for bdb removeal. This takes care of all options ↵brian@zim.(none)2006-08-101-2/+0
| | | | | | | | and variables that rely on bdb.
* | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2006-05-231-0/+1
|\ \ | | | | | | | | | into zim.(none):/home/brian/mysql/dep-5.1
| * \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2006-05-081-0/+1
| |\ \ | | | | | | | | | | | | into zim.(none):/home/brian/mysql/dep-5.1
| | * | Added new show contributors command. brian@zim.(none)2006-05-021-0/+1
| | | |
* | | | fix for bug #17619 Scheduler race conditionsandrey@lmy004.2006-05-221-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Scheduler is either initialized at server start or never. Starting & stopping is now suspending & resuming. - The scheduler has clear OO interface - Now all calls to the scheduler are synchronous - GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc) - External API is encapsulated into class Events - Includes fixes for all comments of Kostja's review of 19.05.2005 Starting to merge into 5.1-release (5.1.10) and push
* | | Added support for key_block_size for key and table level (WL#602)monty@mysql.com2006-05-031-0/+1
|/ / | | | | | | | | | | | | | | Added support for key_block_size to MyISAM. Simplify interface to 'new Key' to make it easier to add new key options. mysqld option --new is used to define where key options are printed. (In 5.3 we should move all key options to after key part definition to avoid problem with reserved names) Fixed some compiler warnings and a memory leak in ssl
* | Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-mergepem@mysql.com2006-04-251-7/+0
|\ \ | |/ | | | | into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
| * Fixed BUG#18949: Test case sp-goto is disabledpem@mysql.com2006-04-181-7/+0
| | | | | | | | | | | | | | | | | | Removed sp-goto.test, sp-goto.result and all (disabled) GOTO code. Also removed some related code that's not needed any more (no possible unresolved label references any more, so no need to check for them). NB: Keeping the ER_SP_GOTO_IN_HNDLR in errmsg.txt; it might become useful in the future, and removing it (and thus re-enumerating error codes) might upset things. (Anything referring to explicit error codes.)
View Lorry Controller Status