diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-12-26 17:42:06 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-12-26 17:42:06 +0200 |
| commit | ececdf09088c0bcf142ae4737c724bf718952fab (patch) | |
| tree | 89ec1a3a0a7c33283b19588a9a564d110058eed0 /.bzrignore | |
| parent | 20aa6caa56670950d9430ca3a62c069ffe0bdd9d (diff) | |
| parent | 71ce58a3b1f0b2d4ec776bc7864076603b3170f4 (diff) | |
| download | mariadb-git-ececdf09088c0bcf142ae4737c724bf718952fab.tar.gz | |
Changes for the BitKeeper resolve.
One more notice:
limiting number of queries per hour for different users has been done
on 4.0.1 , but I can port it to 3.23.*
This will require only certain changes, like number of columns in user
table.
I will also make a test case for it, after it is approved by Monty,
as result file will depend on the error message text.
BitKeeper/etc/ignore:
auto-union
libmysqld/lib_sql.cc:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/lex.h:
Changes for BitKeeper resolve...
sql/sql_class.h:
Changes for BitKeeper resolve...
sql/sql_lex.h:
Changes for BitKeeper resolve...
sql/sql_parse.cc:
Changes for BitKeeper resolve...
sql/sql_yacc.yy:
Changes for BitKeeper resolve...
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 7c1105386e2..0b9549a818c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -21,6 +21,7 @@ .out .snprj/* .vimrc +50 =6 BitKeeper/etc/config BitKeeper/etc/csets @@ -413,6 +414,7 @@ sql/mysqld sql/mysqld-purecov sql/mysqld-purify sql/mysqld-quantify +sql/new.cc sql/share/*.sys sql/share/charsets/gmon.out sql/share/gmon.out |