1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Commit Graph

29222 Commits

Author SHA1 Message Date
8f543b5eb8 BUG#15101 SYSDATE() disregards SET TIMESTAMP.
After the ChangeSet 1.1892.20.1 2005/08/24 (Bug #12562) SYSDATE() is not an alias
   of NOW() and is unsafe for replication.
   `SYSDATE()' backward compatible aliasing clashes with the idea #12562 
   fix. To make it safe-replicatable we have to either use RBR or to restore
   the pre-5.0 style.
   --sysdate-is-now command line flag was introduced to provide backward compatibility.


sql/mysqld.cc:
  New option to force SYSDATE's backward compatible with 4.1 aliasing to NOW (not default)
sql/sql_class.h:
  new slot to fill at init time and check at parse
sql/sql_yacc.yy:
  calling NOW's branches when --sysdate-is-now
mysql-test/r/sysdate_is_now.result:
  New BitKeeper file ``mysql-test/r/sysdate_is_now.result''
mysql-test/t/sysdate_is_now-master.opt:
  New BitKeeper file ``mysql-test/t/sysdate_is_now-master.opt''
mysql-test/t/sysdate_is_now.test:
  New BitKeeper file ``mysql-test/t/sysdate_is_now.test''
2006-03-10 16:47:56 +02:00
696367399b Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2006-03-09 16:49:01 -08:00
01d69c4b96 This patch does 1) fix my build breakage 2) Complete the removal of all symbols which could clash with another parser.
sql/mysql_priv.h:
  Porting update
sql/mysqld.cc:
  Porting update
sql/sp.cc:
  Porting update
sql/sql_lex.cc:
  Porting update
sql/sql_lex.h:
  Porting update
sql/sql_parse.cc:
  Porting update
sql/sql_prepare.cc:
  Portinng update
sql/sql_trigger.cc:
  Porting update
sql/sql_view.cc:
  Porting update
2006-03-09 16:44:08 -08:00
2fbd17779f mysqltest.test:
Fix typos.


mysql-test/t/mysqltest.test:
  Fix typos.
2006-03-09 13:17:19 -06:00
85d705b651 Porting fix that allows others to include compiled code with different parsers.
Makes you wonder what I am up to, doesn't?


configure.in:
  Adjusts bison to not create symbols that clash.
sql/sql_analyse.cc:
  Adding define to make sure sql_yacc.h gets included.
sql/sql_lex.cc:
  Fixing it so that sql_yacc.h is included
sql/sql_lex.h:
  Fixing include rules
sql/sql_parse.cc:
  Adding flag to compile sql_yacc.yy
2006-03-09 10:09:52 -08:00
5e54b63fa3 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/17726-bug-5.0-mysql


sql/item_cmpfunc.cc:
  Auto merged
2006-03-09 14:07:34 +03:00
6c81f34369 Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-09 10:38:41 +04:00
bc6b7859ae Fix for multiple test failures on some platforms.
sql/sql_lex.cc:
  Added a debug assertion that the passed string is not empty.
sql/sql_show.cc:
  Do not quote empty string.
2006-03-09 03:10:39 +03:00
bfa21dd152 Merge bk-internal:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysqltestrun_ndbclusterstart/my50-mysqltestrun_ndbclusterstart
2006-03-08 17:00:56 +01:00
acb53e4ec4 BUG#17574 Detect cluster start failure and "fail" ndb_* tests
- Fix problems that occur when ndbcluster is not supported


mysql-test/lib/mtr_cases.pl:
  Marked test to be skipped if it is a ndb test but ndb is not supported
mysql-test/mysql-test-run.pl:
  Check "opt_with_ndbcluster" before deciding to stop masters and when dciding if cluster needs to be started.
2006-03-08 16:57:42 +01:00
9c6abf3f5c Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
2006-03-08 15:35:30 +01:00
c80332c7b9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
2006-03-08 13:31:05 +01:00
9a293f36e4 After merge
mysql-test/t/rpl_trunc_temp.test:
  Remove final "connection master" it's already disconnected
2006-03-08 10:40:29 +01:00
c5fcf0fdc9 Merge neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137


sql/sql_delete.cc:
  Auto merged
2006-03-08 10:17:12 +01:00
f491db2119 Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave
- Decrease "slave_open_temp_tables" during reopen of truncated table.
 - Add test "rpl_trunc_temp" 


sql/sql_delete.cc:
  Decrease "slave_open_temp_tables" after temporary table has been closed, it will be
  increased again when the temp table is reopened after it's been truncated.
mysql-test/r/rpl_trunc_temp.result:
  New BitKeeper file ``mysql-test/r/rpl_trunc_temp.result''
mysql-test/t/rpl_trunc_temp.test:
  New BitKeeper file ``mysql-test/t/rpl_trunc_temp.test''
2006-03-08 10:15:48 +01:00
9414d3a3e7 Merge bk-internal:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574
2006-03-08 07:47:26 +01:00
a8331c7326 After-merge fix: fix the test case for BUG#16266 to query
only its own tables to prevent getting tables from others.


mysql-test/r/rpl_trigger.result:
  Update the result file.
mysql-test/t/rpl_trigger.test:
  Fix the test to query only its own tables to prevent getting tables
  from other tests.
2006-03-08 00:13:27 +03:00
9a879f89b4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574


mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-07 20:41:04 +01:00
e889f9efcc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
2006-03-07 21:47:41 +03:00
329264140a Bug#17574 Detect cluster start failure and "fail" ndb_* tests
mysql-test/lib/mtr_cases.pl:
  Always set "ndb_test" if tets name contains ndb. 
  Set to skipped if "--skip-ndbcluster"
mysql-test/lib/mtr_report.pl:
  Print special error message for ndb_test that are failed due to failure to start or install ndbcluster
mysql-test/mysql-test-run.pl:
  Remove mtr_error call from ndbcluster_install, instead check after ndbcluster_install if test run should continue or if it should be aborted
  Faile ndb test and print special error message if it's a ndb test and flag_ndb_status_ok is not ok
2006-03-07 19:44:58 +01:00
f4c81a219a Fix missing call to init_tmp_sh_file
client/mysqltest.c:
  Add call to init_tmp_sh_file
2006-03-07 14:34:20 +01:00
99515a3ac8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt


mysql-test/r/sp.result:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/skip_grants.result:
  Merge 5.0 and 5.0-runtime.
mysql-test/t/skip_grants.test:
  Merge 5.0 and 5.0-runtime.
2006-03-07 14:28:09 +03:00
07d36fb99a Enable ifdef for windows specific functions 2006-03-07 08:57:57 +01:00
60ee2bbecb Improve error message for faulty usage of "inc" and "dec"
client/mysqltest.c:
  Improve error messages for "inc" and "dec"
mysql-test/r/mysqltest.result:
  Update test result
2006-03-07 07:50:04 +01:00
e08efc1528 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-07 07:42:51 +01:00
b267660646 after merge
mysql-test/mysql-test-run.sh:
  tests depend on umask
2006-03-06 23:43:47 +01:00
01a35c19cb Fix typo
client/mysqltest.c:
  Fix typo, add extra "s"
2006-03-06 22:18:04 +01:00
e33e0bfc93 Revert
mysql-test/lib/mtr_misc.pl:
  Revert change to outpout exe path and name in win format
2006-03-06 22:14:06 +01:00
187f89a443 Remove unused var
Reduce code


client/mysqltest.c:
  Remove the "cmd" variable in do_sleep, left unintentionaly after merge
  Implement the same elegeant solution to fund the command name in do_modify_ar
2006-03-06 22:08:34 +01:00
502b307358 compilation fixes
BitKeeper/etc/ignore:
  Added include/openssl to the ignore list
2006-03-06 22:08:29 +01:00
4a311f0a50 Win fixes
- Use tmp sh file both in system and popen 


client/mysqltest.c:
  Introduce common functions to handle unix emulation on windows using a temporary sh file.
  Use it both in my_popen and my_system.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Fix "windows paths" in three places that doesn't automatically get fixed
  Uset the output file mysqltest.sql instead of con.sql as con is not an allowed filename on Windows
  Use system for util functions
2006-03-06 22:05:39 +01:00
57839602ac Use grep instead of egrep
Use system inestad of exec


mysql-test/t/trigger-grant.test:
  Use "system" instead of exec for system admin tasks
  No need to use "egrep", changing to "grep"
2006-03-06 21:45:13 +01:00
cf4c785c62 merged
mysql-test/t/kill.test:
  Auto merged
2006-03-06 20:53:14 +01:00
19a1f488a8 merged 2006-03-06 18:34:38 +01:00
a127344a6c kill (subquery) - three years old bugfix that never worked 2006-03-06 18:26:39 +01:00
703aeac212 Merge mysql.com:/home/hf/work/mysql-5.0.15745
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-03-06 19:57:20 +04:00
c37f55e64c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-03-06 10:49:33 -05:00
1e1ea6ce00 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-03-06 10:44:01 -05:00
a581ed72db Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 14:01:15 +01:00
d82eebcb75 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-06 13:45:53 +01:00
13407f2eca Merge mysql.com:/usr/home/bar/mysql-4.1.b15949
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged
2006-03-06 16:20:15 +04:00
89378fe8f6 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:58:16 +04:00
9251e7f710 Merge bk-internal:/home/bk/mysql-5.0
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:28:30 +01:00
5b8d8c919e Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-03-06 15:15:23 +04:00
76e5c1b4b6 post-merge fix 2006-03-06 15:14:15 +04:00
84168ebac2 Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
2006-03-06 12:04:54 +01:00
9281bdd47c Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  SCCS merged
2006-03-06 12:00:51 +01:00
d86a66d483 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b15949
2006-03-06 14:50:34 +04:00
7d24c7d445 4.1 -> 5.0 merge
mysql-test/t/grant.test:
  Auto merged
mysql-test/r/grant.result:
  manual merge
sql/sql_acl.cc:
  manual merge
2006-03-06 14:38:31 +04:00
3ecf9f040a Fix for bug#14385 GRANT and mapping to correct user account problems
Check if the host of table hash record exactly matches host from GRANT command


mysql-test/r/grant.result:
  Fix for bug#14385 GRANT and mapping to correct user account problems
    test case
mysql-test/t/grant.test:
  Fix for bug#14385 GRANT and mapping to correct user account problems
    test case
2006-03-06 14:03:40 +04:00