diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-19 11:15:59 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-19 11:15:59 +0100 |
| commit | be1fb16006b11a360b8439877c34ea6e49007ecf (patch) | |
| tree | 03513f9684a07a5f525ab42fea770ce28016381e /sql | |
| parent | 56ce4907f1112934a34be6c0a4dc03a00ae32436 (diff) | |
| parent | 0eec6c133a164eb2b0c19f0241054edb4a52825f (diff) | |
| download | mariadb-git-be1fb16006b11a360b8439877c34ea6e49007ecf.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
netware/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/Makefile.am:
Auto merged
mysql-test/install_test_db.sh:
Manual merge
sql/sql_acl.h:
Manual merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 5 | ||||
| -rw-r--r-- | sql/sql_acl.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index a1a7c20fc50..3707ff872a6 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -411,8 +411,9 @@ MY_LOCALE *my_locale_by_number(uint number); updated (to store more bytes on disk). NOTE: When adding new SQL_MODE types, make sure to also add them to - ../scripts/mysql_create_system_tables.sh and - ../scripts/mysql_fix_privilege_tables.sql + the scripts used for creating the MySQL system tables + in scripts/mysql_system_tables.sql and scripts/mysql_system_tables_fix.sql + */ #define RAID_BLOCK_SIZE 1024 diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 86d2cabc703..cba283ec65b 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -47,8 +47,7 @@ don't forget to update 1. static struct show_privileges_st sys_privileges[] 2. static const char *command_array[] and static uint command_lengths[] - 3. mysql_create_system_tables.sh, mysql_fix_privilege_tables.sql - and mysql-test/lib/init_db.sql + 3. mysql_system_tables.sql and mysql_system_tables_fix.sql 4. acl_init() or whatever - to define behaviour for old privilege tables 5. sql_yacc.yy - for GRANT/REVOKE to work */ |